aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2008-10-20 09:52:12 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-22 13:05:28 -0400
commit8fc7aeab3851ed8c3ecf28901ca2c6f0400955c7 (patch)
tree1d32732e0a829c63b1b4c91ce541b98a147cf75f
parent8aafdf6a1528b0672a0527be473d9be5a12289d3 (diff)
USB: Speedtouch: add pre_reset and post_reset routines
This patch (as1150) fixes a problem in the speedtch driver. When it resets the modem during probe it will be unbound from the other interfaces it has claimed, because it doesn't define a pre_reset and a post_reset method. The patch defines "do-nothing" methods. This fixes Bugzilla #11767. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/atm/speedtch.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index 76fce44c2f9a..3e862401a638 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -722,6 +722,16 @@ static void speedtch_atm_stop(struct usbatm_data *usbatm, struct atm_dev *atm_de
722 flush_scheduled_work(); 722 flush_scheduled_work();
723} 723}
724 724
725static int speedtch_pre_reset(struct usb_interface *intf)
726{
727 return 0;
728}
729
730static int speedtch_post_reset(struct usb_interface *intf)
731{
732 return 0;
733}
734
725 735
726/********** 736/**********
727** USB ** 737** USB **
@@ -740,6 +750,8 @@ static struct usb_driver speedtch_usb_driver = {
740 .name = speedtch_driver_name, 750 .name = speedtch_driver_name,
741 .probe = speedtch_usb_probe, 751 .probe = speedtch_usb_probe,
742 .disconnect = usbatm_usb_disconnect, 752 .disconnect = usbatm_usb_disconnect,
753 .pre_reset = speedtch_pre_reset,
754 .post_reset = speedtch_post_reset,
743 .id_table = speedtch_usb_ids 755 .id_table = speedtch_usb_ids
744}; 756};
745 757