Prev: [patch 057/123] USB: serial: sierra driver indat_callback fix
Next: [patch 042/123] ALSA: hda: Use 3stack quirk for Toshiba Satellite L40-10Q
From: Greg KH on 12 Mar 2010 20:30
2.6.33-stable review patch. If anyone has any objections, please let me know.

-----------------

From: Baruch Siach <baruch(a)tkos.co.il>

commit bbcd18d1b37413d25eaf4580682b1b8e4a09ff5e upstream.

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>
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 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/serial/imx.c
+++ b/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);


--
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 057/123] USB: serial: sierra driver indat_callback fix
Next: [patch 042/123] ALSA: hda: Use 3stack quirk for Toshiba Satellite L40-10Q