Prev: [PATCH 18/62] Driver-Core: devtmpfs - reset inode permissions before unlinking
Next: [PATCH 06/62] sysdev: Convert node driver class attributes to be data driven
From: Greg Kroah-Hartman on 2 Mar 2010 19:00
From: Baruch Siach <baruch(a)tkos.co.il>

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(a)tkos.co.il>
Cc: Baruch Siach <baruch(a)tkos.co.il>
Cc: Alan Cox <alan(a)linux.intel.com>
Cc: Sascha Hauer <s.hauer(a)pengutronix.de>
Cc: Oskar Schirmer <os(a)emlix.com>
Cc: Fabian Godehardt <fg(a)emlix.com>
Cc: Daniel Glöckner <dg(a)emlix.com>
Cc: stable <stable(a)kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>
---
drivers/serial/imx.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 60d665a..d00fcf8 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1279,7 +1279,7 @@ static int serial_imx_probe(struct platform_device *pdev)
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 platform_device *pdev)

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 platform_device *pdev)

clk_disable(sport->clk);

- if (pdata->exit)
+ if (pdata && pdata->exit)
pdata->exit(pdev);

iounmap(sport->port.membase);
--
1.7.0.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 18/62] Driver-Core: devtmpfs - reset inode permissions before unlinking
Next: [PATCH 06/62] sysdev: Convert node driver class attributes to be data driven