未验证 提交 e3aa9acc 编写于 作者: A Andy Shevchenko 提交者: Mark Brown

spi: pxa2xx: Adapt reset_sccr1() to the case when no message available

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: 3bbdc083 ("spi: pxa2xx: Reuse int_stop_and_reset() in couple of places")
Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210721121520.62605-1-andriy.shevchenko@linux.intel.comSigned-off-by: NMark Brown <broonie@kernel.org>
上级 cfb4dac1
......@@ -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:
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册