linux-next: manual merge of the usb-gadget tree with theusb.current tree

From: Stephen Rothwell
Date: Thu Mar 21 2013 - 23:31:43 EST

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2280.c between commit 8119b55aed81 ("USB: gadget:
net2280: remove leftover driver->unbind call in error pathway") from the
usb.current tree and commit 68abc94f8de8 ("usb: gadget: net2280: don't
touch") from the usb-gadget tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/gadget/net2280.c
index 3bd0f99,691cc65..0000000
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@@ -1924,7 -1920,7 +1920,6 @@@ static int net2280_start(struct usb_gad
device_remove_file (&dev->pdev->dev, &dev_attr_function);
- dev-> = NULL;
- driver->unbind (&dev->gadget);
dev->driver = NULL;
return retval;

Attachment: pgp00000.pgp
Description: PGP signature