diff options
| author | Maarten ter Huurne <maarten@treewalker.org> | 2013-08-19 08:24:08 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-08-27 21:16:57 +0200 |
| commit | b130f03fd2b156ba0d1f82f8b3d9624fe342753e (patch) | |
| tree | 2b8973aafaa1a7b49f99e4a70c821b5f19200271 | |
| parent | usb: musb: cppi41: fix missing unlock on error in cppi41_dma_callback() (diff) | |
| download | linux-b130f03fd2b156ba0d1f82f8b3d9624fe342753e.tar.xz linux-b130f03fd2b156ba0d1f82f8b3d9624fe342753e.zip | |
usb: musb: avoid null pointer dereference in debug logging
Since commit 511f3c53 (usb: gadget: udc-core: fix a regression during
gadget driver unbinding) usb_gadget_remove_driver will pass NULL for
the driver argument.
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/musb/musb_gadget.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 696e9e0b05af..b7b8b2bc4ee9 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -1937,7 +1937,8 @@ static int musb_gadget_stop(struct usb_gadget *g, stop_activity(musb, driver); otg_set_peripheral(musb->xceiv->otg, NULL); - dev_dbg(musb->controller, "unregistering driver %s\n", driver->function); + dev_dbg(musb->controller, "unregistering driver %s\n", + driver ? driver->function : "(removed)"); musb->is_active = 0; musb->gadget_driver = NULL; |