USB: sl811-hcd: Fix device disconnect:

SL811 Device detected after removal used to be working in linux-2.6.22
but then broke somewhere between 2.6.22 and 2.6.28. Current
hub_port_connect_change() in drivers/usb/core/hub.c won't call
usb_disconnect() in case the SL811 driver sets portstatus
USB_PORT_FEAT_CONNECTION upon removal.
AFAIK the SL811 has only a combined Device Insert/Remove
detection bit, therefore use a count to distinguish insert or remove.


Signed-Off-By: Michael Hennerich <hennerich@blackfin.uclinux.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index a949259f18b9..5b22a4d1c9e4 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -719,8 +719,12 @@ retry:
                 /* port status seems weird until after reset, so
                  * force the reset and make khubd clean up later.
                  */
-                sl811->port1 |= (1 << USB_PORT_FEAT_C_CONNECTION)
-                                | (1 << USB_PORT_FEAT_CONNECTION);
+                if (sl811->stat_insrmv & 1)
+                        sl811->port1 |= 1 << USB_PORT_FEAT_CONNECTION;
+                else
+                        sl811->port1 &= ~(1 << USB_PORT_FEAT_CONNECTION);
+
+                sl811->port1 |= 1 << USB_PORT_FEAT_C_CONNECTION;
 
         } else if (irqstat & SL11H_INTMASK_RD) {
                 if (sl811->port1 & (1 << USB_PORT_FEAT_SUSPEND)) {