The patch titled serial: imx: fix NULL dereference Oops when pdata == NULL has been removed from the -mm tree. Its filename was serial-imx-fix-null-dereference-oops-when-pdata-==-null.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: serial: imx: fix NULL dereference Oops when pdata == NULL From: Baruch Siach <baruch@xxxxxxxxxx> The platform code doesn't have to provide platform data to get sensible default behaviour from the imx serial driver. This patch does not handle NULL dereference in the IrDA case, which still requires a valid platform data pointer (in imx_startup()/imx_shutdown()), since I don't know whether there is a sensible default behaviour, or should the operation just fail cleanly. Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx> Cc: Baruch Siach <baruch@xxxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxx> Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> Cc: Oskar Schirmer <os@xxxxxxxxx> Cc: Fabian Godehardt <fg@xxxxxxxxx> Cc: Daniel Glöckner <dg@xxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Cc: <stable@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/imx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/serial/imx.c~serial-imx-fix-null-dereference-oops-when-pdata-==-null drivers/serial/imx.c --- a/drivers/serial/imx.c~serial-imx-fix-null-dereference-oops-when-pdata-==-null +++ a/drivers/serial/imx.c @@ -1279,7 +1279,7 @@ static int serial_imx_probe(struct platf sport->use_irda = 1; #endif - if (pdata->init) { + if (pdata && pdata->init) { ret = pdata->init(pdev); if (ret) goto clkput; @@ -1292,7 +1292,7 @@ static int serial_imx_probe(struct platf return 0; deinit: - if (pdata->exit) + if (pdata && pdata->exit) pdata->exit(pdev); clkput: clk_put(sport->clk); @@ -1321,7 +1321,7 @@ static int serial_imx_remove(struct plat clk_disable(sport->clk); - if (pdata->exit) + if (pdata && pdata->exit) pdata->exit(pdev); iounmap(sport->port.membase); _ Patches currently in -mm which might be from baruch@xxxxxxxxxx are linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html