summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-23 17:13:30 +0400
committerMark Brown <broonie@linaro.org>2014-01-23 17:13:30 +0400
commit341e6df6c887b1101970908d33c110fb32688d8c (patch)
treee65dbc47be9e6aaacc8db860aeab1581fe2f4f1e /drivers/spi
parent8aeab58e560da02772d6018eb4d6923514476a04 (diff)
parentdf900e678308d7fa1290681bfc336716b084b3c5 (diff)
downloadlinux-341e6df6c887b1101970908d33c110fb32688d8c.tar.xz
Merge commit 'spi/fix/rcar' into spi-linus
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-rspi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index d1e89bb352d8..28987d9fcfe5 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -548,7 +548,7 @@ static void rspi_receive_init(const struct rspi_data *rspi)
rspi_read16(rspi, RSPI_SPDR); /* dummy read */
if (spsr & SPSR_OVRF)
rspi_write8(rspi, rspi_read8(rspi, RSPI_SPSR) & ~SPSR_OVRF,
- RSPI_SPCR);
+ RSPI_SPSR);
}
static int rspi_receive_pio(struct rspi_data *rspi, struct spi_message *mesg,
@@ -984,8 +984,9 @@ static int rspi_probe(struct platform_device *pdev)
INIT_WORK(&rspi->ws, rspi_work);
init_waitqueue_head(&rspi->wait);
- master->num_chipselect = rspi_pd->num_chipselect;
- if (!master->num_chipselect)
+ if (rspi_pd && rspi_pd->num_chipselect)
+ master->num_chipselect = rspi_pd->num_chipselect;
+ else
master->num_chipselect = 2; /* default */
master->bus_num = pdev->id;