0.12beta7: un-done the workaround for 2.4.x kernels and usb-uhci calling disconnect during resetting the device (it didn't work)

4 files changed, 10 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index 85e6353..56784e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-#$Id: Makefile,v 1.22 2004/01/17 12:15:44 jal2 Exp $
+#$Id: Makefile,v 1.23 2004/02/20 22:14:42 jal2 Exp $
 
-VERSION = 0.12beta6
+VERSION = 0.12beta7
 
 CC=gcc
 
diff --git a/at76c503-fw_skel.c b/at76c503-fw_skel.c
index 568864c..92f2a34 100644
--- a/at76c503-fw_skel.c
+++ b/at76c503-fw_skel.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- */
 /*
- * $Id: at76c503-fw_skel.c,v 1.4 2004/01/17 12:15:44 jal2 Exp $
+ * $Id: at76c503-fw_skel.c,v 1.5 2004/02/20 22:14:42 jal2 Exp $
  *
  * Driver for at76c503-based devices based on the Atmel "Fast-Vnet" reference
  *
@@ -157,15 +157,9 @@ static void at76c50x_disconnect(struct usb_interface *interface)
 	usb_set_intfdata(interface, NULL);
 #endif
 
-	if (!(((struct at76c503 *)ptr)->flags & AT76C503A_USB_RESET)) {
-		info("%s disconnecting", ((struct at76c503 *)ptr)->netdev->name);
-		at76c503_delete_device(ptr);
-		info(DRIVER_NAME " disconnected");
-	} else {
-		info("%s: %s called during reset - ignored "
-		     "(assuming broken usb-uhci behaviour)",
-		     ((struct at76c503 *)ptr)->netdev->name, __FUNCTION__);
-	}
+	info("%s disconnecting", ((struct at76c503 *)ptr)->netdev->name);
+	at76c503_delete_device(ptr);
+	info(DRIVER_NAME " disconnected");
 }
 
 static int __init mod_init(void)
diff --git a/at76c503.c b/at76c503.c
index d9c0a36..ac218b7 100644
--- a/at76c503.c
+++ b/at76c503.c
@@ -1,5 +1,5 @@
 /* -*- linux-c -*- */
-/* $Id: at76c503.c,v 1.42 2004/01/10 20:31:17 jal2 Exp $
+/* $Id: at76c503.c,v 1.43 2004/02/20 22:14:42 jal2 Exp $
  *
  * USB at76c503/at76c505 driver
  *
@@ -2464,12 +2464,6 @@ end_scan:
 
 		dbg(DBG_DEVSTART, "resetting the device");
 
-		/* flag that we reset the device to
-		   at76c503-fw_skel.c:at76c50x_disconnect(), which gets
-		   called during reset by usb-uhci of 2.4.23 (uhci doesn't
-		   call it, nor does uhci-hcd of 2.6.0!) */
-		dev->flags |= AT76C503A_USB_RESET;
-
 		usb_reset_device(dev->udev);
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0)
@@ -2477,8 +2471,6 @@ end_scan:
 		dev->udev->state = USB_STATE_CONFIGURED;
 #endif
 
-		dev->flags &= ~AT76C503A_USB_RESET;
-
 		/* jal: currently (2.6.0-test2 and 2.4.23) 
 		   usb_reset_device() does not recognize that
 		   the interface descr. are changed.
@@ -5113,7 +5105,7 @@ int init_new_device(struct at76c503 *dev)
 	else
 		dev->rx_data_fcs_len = 4;
 
-	info("$Id: at76c503.c,v 1.42 2004/01/10 20:31:17 jal2 Exp $ compiled %s %s", __DATE__, __TIME__);
+	info("$Id: at76c503.c,v 1.43 2004/02/20 22:14:42 jal2 Exp $ compiled %s %s", __DATE__, __TIME__);
 	info("firmware version %d.%d.%d #%d (fcs_len %d)",
 	     dev->fw_version.major, dev->fw_version.minor,
 	     dev->fw_version.patch, dev->fw_version.build,
diff --git a/at76c503.h b/at76c503.h
index 0ed1961..e7e70fd 100644
--- a/at76c503.h
+++ b/at76c503.h
@@ -1,5 +1,5 @@
 /* -*- linux-c -*- */
-/* $Id: at76c503.h,v 1.18 2004/01/10 20:31:17 jal2 Exp $
+/* $Id: at76c503.h,v 1.19 2004/02/20 22:14:42 jal2 Exp $
  *
  * USB at76c503 driver
  *
@@ -601,8 +601,7 @@ struct at76c503 {
 
 #define AT76C503A_UNPLUG 1
 #define AT76C503A_NETDEV_REGISTERED 2
-#define AT76C503A_USB_RESET 4  /* set during call to usb_reset_device and 
-				  update_usb_intf_descr() in at76c503.c */
+
 /* Function prototypes */
 
 int at76c503_do_probe(struct module *mod, struct usb_device *udev,