From 1aee199cadc0807184c34f2063c795821517f588 Mon Sep 17 00:00:00 2001 From: Arjan Mels Date: Thu, 30 Jun 2011 22:18:18 +0200 Subject: drivers/staging/usbip: bugfix prevent driver unbind regression in linux-next Fix regression problem in linux-next: post_reset and pre_reset are no longer included in linux-next while they are in linux-3.0rc5. Signed-off-by: Arjan Mels Cc: usbip-devel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/usbip/stub_dev.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'drivers/staging/usbip') diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c index e26b2eede507..fce22f2bd8bf 100644 --- a/drivers/staging/usbip/stub_dev.c +++ b/drivers/staging/usbip/stub_dev.c @@ -524,9 +524,28 @@ static void stub_disconnect(struct usb_interface *interface) } } +/* + * Presence of pre_reset and post_reset prevents the driver from being unbound + * when the device is being reset + */ + +int stub_pre_reset(struct usb_interface *interface) +{ + dev_dbg(&interface->dev, "pre_reset\n"); + return 0; +} + +int stub_post_reset(struct usb_interface *interface) +{ + dev_dbg(&interface->dev, "post_reset\n"); + return 0; +} + struct usb_driver stub_driver = { .name = "usbip-host", .probe = stub_probe, .disconnect = stub_disconnect, .id_table = stub_table, -}; + .pre_reset = stub_pre_reset, + .post_reset = stub_post_reset, + }; -- cgit v1.2.3