usb gadget: don't save bind callback in struct usb_configuration

[net-next-2.6.git] / drivers / usb / gadget / cdc2.c

diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
index 1f2a9b1e4f2dbbbc0b445ca7907d89c18bb402aa..2720ab07ef1a4da3fd1ca2c45ebe61d677aee788 100644 (file)
--- a/drivers/usb/gadget/cdc2.c
+++ b/drivers/usb/gadget/cdc2.c
@@ -151,7 +151,6 @@ static int __init cdc_do_config(struct usb_configuration *c)
 
 static struct usb_configuration cdc_config_driver = {
        .label                  = "CDC Composite (ECM + ACM)",
-       .bind                   = cdc_do_config,
        .bConfigurationValue    = 1,
        /* .iConfiguration = DYNAMIC */
        .bmAttributes           = USB_CONFIG_ATT_SELFPOWER,
@@ -218,7 +217,7 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)
        device_desc.iProduct = status;
 
        /* register our configuration */
-       status = usb_add_config(cdev, &cdc_config_driver);
+       status = usb_add_config(cdev, &cdc_config_driver, cdc_do_config);
        if (status < 0)
                goto fail1;