diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2016-01-25 13:01:29 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@kernel.org> | 2016-02-03 20:03:40 +0200 |
| commit | 79c5623f1cb85f33403eb9f1e45124e9f56181f8 (patch) | |
| tree | d4e1dbf0104ca7df3e5cccef69b85e97a8e41b5c /drivers/usb/musb/ux500.c | |
| parent | 63b121e3a3167df9fdb99633fd1c840c841b07b9 (diff) | |
| download | linux-79c5623f1cb85f33403eb9f1e45124e9f56181f8.tar.gz linux-79c5623f1cb85f33403eb9f1e45124e9f56181f8.tar.bz2 linux-79c5623f1cb85f33403eb9f1e45124e9f56181f8.zip | |
usb: musb: ux500: Fix NULL pointer dereference at system PM
The commit 7d32cdef5356 ("usb: musb: fail with error when no DMA
controller set"), caused the core platform driver to correctly return an
error code when fail probing.
Unfurtante it also caused bug for a NULL pointer dereference, during
system suspend for the ux500 driver. The reason is a lacking validation
of the corresponding ->driver_data pointer, which won't be set when the
musb core driver fails to probe (or haven't yet been probed).
Fixes: 7d32cdef5356 ("usb: musb: fail with error when no DMA...")
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
Diffstat (limited to 'drivers/usb/musb/ux500.c')
| -rw-r--r-- | drivers/usb/musb/ux500.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c index b2685e75a683..3eaa4ba6867d 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c @@ -348,7 +348,9 @@ static int ux500_suspend(struct device *dev) struct ux500_glue *glue = dev_get_drvdata(dev); struct musb *musb = glue_to_musb(glue); - usb_phy_set_suspend(musb->xceiv, 1); + if (musb) + usb_phy_set_suspend(musb->xceiv, 1); + clk_disable_unprepare(glue->clk); return 0; @@ -366,7 +368,8 @@ static int ux500_resume(struct device *dev) return ret; } - usb_phy_set_suspend(musb->xceiv, 0); + if (musb) + usb_phy_set_suspend(musb->xceiv, 0); return 0; } |