| Message ID | 1496270458-6479-6-git-send-email-andrea.adami@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> - retval = mtd_device_parse_register(mtd, NULL, NULL, > + retval = mtd_device_parse_register(mtd, > + data->types ? data->types : NULL, This is superfluous. You want to check against 'data' instead as it is done below. Otherwis you might get a NULL pointer dereference. > + NULL, > data ? data->partition : NULL, > data ? data->num_partitions : 0);
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c index fc5e773..bea05bb 100644 --- a/drivers/mtd/nand/tmio_nand.c +++ b/drivers/mtd/nand/tmio_nand.c @@ -440,7 +440,9 @@ static int tmio_probe(struct platform_device *dev) goto err_irq; /* Register the partitions */ - retval = mtd_device_parse_register(mtd, NULL, NULL, + retval = mtd_device_parse_register(mtd, + data->types ? data->types : NULL, + NULL, data ? data->partition : NULL, data ? data->num_partitions : 0); if (!retval)
Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- drivers/mtd/nand/tmio_nand.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)