Commit 46216506 authored by Linus Walleij's avatar Linus Walleij Committed by Greg Kroah-Hartman

usb: host: fotg2: Fix potential NULL dereference

There is code in the .remove() hook to handle the drvdata
being NULL, for good reasons: it is never set, so it will
always be NULL. As I moved code around, static checkers
start complaining.

Instead of this, make sure to always set it on successful
probe so we can always dereference it on the remove path.

Use the platform_device_[set|get]_drvdata() since this is
a platform device.

Fixes: ffa8a31b ("usb: host: fotg2: add silicon clock handling")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3df0e240
......@@ -5636,6 +5636,7 @@ static int fotg210_hcd_probe(struct platform_device *pdev)
goto failed_dis_clk;
}
device_wakeup_enable(hcd->self.controller);
platform_set_drvdata(pdev, hcd);
return retval;
......@@ -5656,16 +5657,12 @@ static int fotg210_hcd_probe(struct platform_device *pdev)
*/
static int fotg210_hcd_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct usb_hcd *hcd = platform_get_drvdata(pdev);
struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
if (!IS_ERR(fotg210->pclk))
clk_disable_unprepare(fotg210->pclk);
if (!hcd)
return 0;
usb_remove_hcd(hcd);
usb_put_hcd(hcd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment