diff options
author | Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2018-09-06 08:12:19 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-09-06 13:04:07 -0400 |
commit | 6b45a2b1c0bc2aec84d1c56a1976ca9c8a621ecb (patch) | |
tree | 4cc5ddeb9fb336871df3b188d5a65d186aa04184 /drivers/memory | |
parent | e312b6dcbb633bc87414f1143e0015adbbf87ae0 (diff) |
memory: ti-aemif: fix a potential NULL-pointer dereference
Platform data pointer may be NULL. We check it everywhere but in one
place. Fix it.
Fixes: 8af70cd2ca50 ("memory: aemif: add support for board files")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Cc: stable@vger.kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/memory')
-rw-r--r-- | drivers/memory/ti-aemif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c index 31112f622b88..475e5b3790ed 100644 --- a/drivers/memory/ti-aemif.c +++ b/drivers/memory/ti-aemif.c | |||
@@ -411,7 +411,7 @@ static int aemif_probe(struct platform_device *pdev) | |||
411 | if (ret < 0) | 411 | if (ret < 0) |
412 | goto error; | 412 | goto error; |
413 | } | 413 | } |
414 | } else { | 414 | } else if (pdata) { |
415 | for (i = 0; i < pdata->num_sub_devices; i++) { | 415 | for (i = 0; i < pdata->num_sub_devices; i++) { |
416 | pdata->sub_devices[i].dev.parent = dev; | 416 | pdata->sub_devices[i].dev.parent = dev; |
417 | ret = platform_device_register(&pdata->sub_devices[i]); | 417 | ret = platform_device_register(&pdata->sub_devices[i]); |