From 661fe8401f6e23dca211a57ea57781e2908fd2b2 Mon Sep 17 00:00:00 2001 From: Michal Nazarewicz Date: Mon, 9 Nov 2009 14:15:25 +0100 Subject: [PATCH] --- yaml --- r: 174953 b: refs/heads/master c: 915c8befccbe5d81d441b53ab7a9a98caf0c67d4 h: refs/heads/master i: 174951: 469660885b3f9e3b85122b5fb23aea4402185ace v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/composite.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index acc9fc63f3f7..a7f1977622e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ea864cffdfd327117d4b7829935974b3f47ff31 +refs/heads/master: 915c8befccbe5d81d441b53ab7a9a98caf0c67d4 diff --git a/trunk/drivers/usb/gadget/composite.c b/trunk/drivers/usb/gadget/composite.c index 8498f1a114d5..09289bb1e20f 100644 --- a/trunk/drivers/usb/gadget/composite.c +++ b/trunk/drivers/usb/gadget/composite.c @@ -1092,7 +1092,8 @@ static struct usb_gadget_driver composite_driver = { .speed = USB_SPEED_HIGH, .bind = composite_bind, - .unbind = __exit_p(composite_unbind), + /* .unbind = __exit_p(composite_unbind), */ + .unbind = composite_unbind, .setup = composite_setup, .disconnect = composite_disconnect, @@ -1141,7 +1142,7 @@ int __init usb_composite_register(struct usb_composite_driver *driver) * This function is used to unregister drivers using the composite * driver framework. */ -void __exit usb_composite_unregister(struct usb_composite_driver *driver) +void /* __exit */ usb_composite_unregister(struct usb_composite_driver *driver) { if (composite != driver) return;