aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/cdc2.c
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2008-07-01 16:18:20 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-21 18:16:48 -0400
commitac90e36592ea5171c4e70f58b39a782d871a7d9f (patch)
tree00cb3eb55e6fa3e08d82b181b07c580260484c2b /drivers/usb/gadget/cdc2.c
parentc24f42276b4c4467e82cdd5a941fb7f9400aeea0 (diff)
usb_gadget: composite cdc gadget fault handling
These two fixes ensure the new "CDC Composite Device" gadget fails cleanly when it's loaded on hardware that can't support this particular gadget driver. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/cdc2.c')
-rw-r--r--drivers/usb/gadget/cdc2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
index 289c75277135..d490d0289507 100644
--- a/drivers/usb/gadget/cdc2.c
+++ b/drivers/usb/gadget/cdc2.c
@@ -124,7 +124,7 @@ static int __init cdc_do_config(struct usb_configuration *c)
124 return status; 124 return status;
125 125
126 status = acm_bind_config(c, 0); 126 status = acm_bind_config(c, 0);
127 if (status == 0) 127 if (status < 0)
128 return status; 128 return status;
129 129
130 return 0; 130 return 0;