From a31d66def8d146f17fd9a953d2a57545ae2fd153 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 21 Dec 2009 16:26:46 -0800 Subject: [PATCH] --- yaml --- r: 185180 b: refs/heads/master c: bbcd18d1b37413d25eaf4580682b1b8e4a09ff5e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/imx.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e8a7f496b16a..a5dce4441b64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac6ec5b1de5d1d5afcbe88d73c05df71dca0ac39 +refs/heads/master: bbcd18d1b37413d25eaf4580682b1b8e4a09ff5e diff --git a/trunk/drivers/serial/imx.c b/trunk/drivers/serial/imx.c index 60d665a17a88..d00fcf8e6c70 100644 --- a/trunk/drivers/serial/imx.c +++ b/trunk/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);