Skip to content

Commit

Permalink
spi: pxa2xx: Adapt reset_sccr1() to the case when no message available
Browse files Browse the repository at this point in the history
In some cases reset_sccr1() can be called when no message available.
This means that there is no associated chip to receive that message
and hence no threshold needs to be set. Adapt the function to such
cases.

Fixes: 3bbdc08 ("spi: pxa2xx: Reuse int_stop_and_reset() in couple of places")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210721121520.62605-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Andy Shevchenko authored and Mark Brown committed Jul 22, 2021
1 parent cfb4dac commit e3aa9ac
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions drivers/spi/spi-pxa2xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,15 @@ static int u32_reader(struct driver_data *drv_data)

static void reset_sccr1(struct driver_data *drv_data)
{
struct chip_data *chip = spi_get_ctldata(drv_data->controller->cur_msg->spi);
u32 mask = drv_data->int_cr1 | drv_data->dma_cr1;
u32 mask = drv_data->int_cr1 | drv_data->dma_cr1, threshold;
struct chip_data *chip;

if (drv_data->controller->cur_msg) {
chip = spi_get_ctldata(drv_data->controller->cur_msg->spi);
threshold = chip->threshold;
} else {
threshold = 0;
}

switch (drv_data->ssp_type) {
case QUARK_X1000_SSP:
Expand All @@ -609,7 +616,7 @@ static void reset_sccr1(struct driver_data *drv_data)
break;
}

pxa2xx_spi_update(drv_data, SSCR1, mask, chip->threshold);
pxa2xx_spi_update(drv_data, SSCR1, mask, threshold);
}

static void int_stop_and_reset(struct driver_data *drv_data)
Expand Down

0 comments on commit e3aa9ac

Please sign in to comment.