usb: ehci-mxc: check for pdata before dereferencing
authorDaniel Mack <zonque@gmail.com>
Wed, 21 Aug 2013 09:17:21 +0000 (11:17 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Aug 2013 17:46:03 +0000 (10:46 -0700)
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>
drivers/usb/host/ehci-mxc.c

index 5899ad6626c7525feafc68d712de54906355c5cc..0528dc4526c8ec1739a2c198fc07454561533ee7 100644 (file)
@@ -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);