| Message ID | 20180307094658.9008-2-johan@kernel.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next,1/2] net: kalmia: clean up bind error path | expand |
Am Mittwoch, den 07.03.2018, 10:46 +0100 schrieb Johan Hovold: > Drop bogus call to usb_driver_release_interface() from an error path in > the usbnet bind() callback, which is called during interface probe. At > this point the interface is not bound and usb_driver_release_interface() > returns early. > > Also remove the bogus call to clear the interface data, which is owned > by the usbnet driver and would not even have been set by the time bind() > is called. > > Signed-off-by: Johan Hovold <johan@kernel.org> Acked-by: Oliver Neukum <oneukum@suse.com> > --- > drivers/net/usb/cdc_eem.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c > index f7180f8db39e..61ea4eaace5d 100644 > --- a/drivers/net/usb/cdc_eem.c > +++ b/drivers/net/usb/cdc_eem.c > @@ -83,11 +83,8 @@ static int eem_bind(struct usbnet *dev, struct usb_interface *intf) > int status = 0; > > status = usbnet_get_endpoints(dev, intf); > - if (status < 0) { > - usb_set_intfdata(intf, NULL); > - usb_driver_release_interface(driver_of(intf), intf); > + if (status < 0) > return status; > - } > > /* no jumbogram (16K) support for now */ >
On Wed, Mar 07, 2018 at 10:46:58AM +0100, Johan Hovold wrote: > Drop bogus call to usb_driver_release_interface() from an error path in > the usbnet bind() callback, which is called during interface probe. At > this point the interface is not bound and usb_driver_release_interface() > returns early. > > Also remove the bogus call to clear the interface data, which is owned > by the usbnet driver and would not even have been set by the time bind() > is called. > > Signed-off-by: Johan Hovold <johan@kernel.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
From: Johan Hovold <johan@kernel.org> Date: Wed, 7 Mar 2018 10:46:58 +0100 > Drop bogus call to usb_driver_release_interface() from an error path in > the usbnet bind() callback, which is called during interface probe. At > this point the interface is not bound and usb_driver_release_interface() > returns early. > > Also remove the bogus call to clear the interface data, which is owned > by the usbnet driver and would not even have been set by the time bind() > is called. > > Signed-off-by: Johan Hovold <johan@kernel.org> Applied.
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c index f7180f8db39e..61ea4eaace5d 100644 --- a/drivers/net/usb/cdc_eem.c +++ b/drivers/net/usb/cdc_eem.c @@ -83,11 +83,8 @@ static int eem_bind(struct usbnet *dev, struct usb_interface *intf) int status = 0; status = usbnet_get_endpoints(dev, intf); - if (status < 0) { - usb_set_intfdata(intf, NULL); - usb_driver_release_interface(driver_of(intf), intf); + if (status < 0) return status; - } /* no jumbogram (16K) support for now */
Drop bogus call to usb_driver_release_interface() from an error path in the usbnet bind() callback, which is called during interface probe. At this point the interface is not bound and usb_driver_release_interface() returns early. Also remove the bogus call to clear the interface data, which is owned by the usbnet driver and would not even have been set by the time bind() is called. Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/net/usb/cdc_eem.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)