summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-mxc.c
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2013-08-21 11:17:21 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-23 10:46:03 -0700
commitf375fc520d4df0cd9fcb570f33c103c6c0311f9e (patch)
tree27979fd0b29a34f678a6743f033c3f7bb5fc3cb2 /drivers/usb/host/ehci-mxc.c
parent67e51ec4ed09482b53a81fb33df81a2d5a15aa2f (diff)
downloadblackbird-op-linux-f375fc520d4df0cd9fcb570f33c103c6c0311f9e.tar.gz
blackbird-op-linux-f375fc520d4df0cd9fcb570f33c103c6c0311f9e.zip
usb: ehci-mxc: check for pdata before dereferencing
Commit 7e8d5cd93fac ("USB: Add EHCI support for MX27 and MX31 based boards") introduced code that could potentially lead to a NULL pointer dereference on driver removal. Fix this by checking for the value of pdata before dereferencing it. Signed-off-by: Daniel Mack <zonque@gmail.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: stable <stable@vger.kernel.org> # 2.6.33+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-mxc.c')
-rw-r--r--drivers/usb/host/ehci-mxc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index 5899ad6626c7..0528dc4526c8 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -184,7 +184,7 @@ static int ehci_mxc_drv_remove(struct platform_device *pdev)
if (pdata && pdata->exit)
pdata->exit(pdev);
- if (pdata->otg)
+ if (pdata && pdata->otg)
usb_phy_shutdown(pdata->otg);
clk_disable_unprepare(priv->usbclk);
OpenPOWER on IntegriCloud