diff options
| author | Arjan Mels <arjan.mels@gmx.net> | 2011-06-30 22:18:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 20:14:10 -0700 |
| commit | 1aee199cadc0807184c34f2063c795821517f588 (patch) | |
| tree | ed0ebd8d21f95c608ea383369ab6f851de2cd50c /drivers/staging/usbip | |
| parent | 8547d4cc2b616e4f1dafebe2c673fc986422b506 (diff) | |
| download | linux-stable-1aee199cadc0807184c34f2063c795821517f588.tar.gz linux-stable-1aee199cadc0807184c34f2063c795821517f588.tar.bz2 linux-stable-1aee199cadc0807184c34f2063c795821517f588.zip | |
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 <arjan.mels@gmx.net>
Cc: usbip-devel <usbip-devel@lists.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/usbip')
| -rw-r--r-- | drivers/staging/usbip/stub_dev.c | 21 |
1 files changed, 20 insertions, 1 deletions
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, + }; |