apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'origin' into devel-stable

Browse Source 
Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c
This commit is contained in:
Russell King
2010-03-08 20:21:04 +00:00
parent 004c1c7096 25cf84cf37
commit 988addf82e
6361 changed files with 410071 additions and 173537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/serial/imx.c
+3 -3
View File
@@ -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);