| Message ID | 20180514091129.3422-1-boris.brezillon@bootlin.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6282f122913e632c2415c236a2b5faa8ef368b10 |
| Headers | show |
diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c index c54b760e00ed..5f19016bbf10 100644 --- a/drivers/spi/spi-ti-qspi.c +++ b/drivers/spi/spi-ti-qspi.c @@ -718,7 +718,9 @@ static int ti_qspi_probe(struct platform_device *pdev) "memory mapped resource not required\n"); } } - qspi->mmap_size = resource_size(res_mmap); + + if (res_mmap) + qspi->mmap_size = resource_size(res_mmap); irq = platform_get_irq(pdev, 0); if (irq < 0) {
resource_size() is dereferencing the res without checking that it is not NULL, so we need to do the check before calling resource_size(). Fixes: b95cb394ab59 ("spi: ti-qspi: Implement the spi_mem interface") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> --- drivers/spi/spi-ti-qspi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)