From 4723be7df6675e5ea4dd6637aedae29f36562116 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Fri, 17 Oct 2014 11:23:33 -0500 Subject: [PATCH] usb: gadget: udc: net2280: do not rely on 'driver' argument commit bfd0ed576dbf9cc71af7dbe42841fc9246524961 upstream. future patches will remove the extra 'driver' argument to ->udc_stop(), in order to do that, we must make sure that our UDC does not rely on it first. Signed-off-by: Felipe Balbi [bwh: Backported to 3.16: adjust filename, context] Signed-off-by: Ben Hutchings --- drivers/usb/gadget/net2280.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index b464ed5e129e..22664e36f3e1 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c @@ -1956,11 +1956,9 @@ static int net2280_stop(struct usb_gadget *_gadget, dev = container_of (_gadget, struct net2280, gadget); spin_lock_irqsave (&dev->lock, flags); - stop_activity (dev, driver); + stop_activity(dev, NULL); spin_unlock_irqrestore (&dev->lock, flags); - dev->driver = NULL; - net2280_led_active (dev, 0); /* Disable full-speed test mode */ @@ -1970,7 +1968,8 @@ static int net2280_stop(struct usb_gadget *_gadget, device_remove_file (&dev->pdev->dev, &dev_attr_queues); DEBUG(dev, "unregistered driver '%s'\n", - driver ? driver->driver.name : ""); + dev->driver ? dev->driver->driver.name : ""); + dev->driver = NULL; return 0; }