aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorVivek Gautam <gautam.vivek@samsung.com>2013-04-09 18:42:11 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-09 16:38:04 -0700
commitbbcd85a0e624a6825e2b4477a5ad2a7873288809 (patch)
tree16e2d24201c9d840d57c82d941eb31213f2fd883 /drivers/usb/host
parentMerge tag 'for-usb-next-2012-04-08' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next (diff)
downloadlinux-dev-bbcd85a0e624a6825e2b4477a5ad2a7873288809.tar.xz
linux-dev-bbcd85a0e624a6825e2b4477a5ad2a7873288809.zip
usb: ehci-s5p: fix: Fix null pointer dereferencing
7edb3da: (USB: EHCI: make ehci-s5p a separate driver) raised an issue with ehci-s5p's driver data. Now that 's5p_ehci_hcd' doesn't maintain pointer to 'usb_hcd' and s5p_ehci is nothing but a pointer to hcd->priv; add hcd to the driver data rather than s5p_ehci. This fixes issues with null pointer dereferencing in s5p_ehci_shutdown(), s5p_ehci_suspend(), s5p_ehci_resume(). Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com> CC: Manjunath Goudar <manjunath.goudar@linaro.org> CC: Arnd Bergmann <arnd@arndb.de> CC: Jingoo Han <jg1.han@samsung.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci-s5p.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index d8cb0ca563b5..580548ad8530 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -173,7 +173,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
goto fail_add_hcd;
}
- platform_set_drvdata(pdev, s5p_ehci);
+ platform_set_drvdata(pdev, hcd);
return 0;