From 1dc309e2f9117693e7d696a0f6170281481e09df Mon Sep 17 00:00:00 2001 From: "Hennerich, Michael" Date: Wed, 2 Sep 2009 09:26:21 +0100 Subject: [PATCH] --- yaml --- r: 164925 b: refs/heads/master c: eb661bc88252e5c6dc69df732e77e42981dd4d8b h: refs/heads/master i: 164923: 0dc496f6a525058c650e51eba6b09db08d0388ac v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/sl811-hcd.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e37f7dc27670..dce9a54ca413 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec3815c3e14dc68d49428e6505ae99e86e5dd067 +refs/heads/master: eb661bc88252e5c6dc69df732e77e42981dd4d8b diff --git a/trunk/drivers/usb/host/sl811-hcd.c b/trunk/drivers/usb/host/sl811-hcd.c index a949259f18b9..5b22a4d1c9e4 100644 --- a/trunk/drivers/usb/host/sl811-hcd.c +++ b/trunk/drivers/usb/host/sl811-hcd.c @@ -719,8 +719,12 @@ static irqreturn_t sl811h_irq(struct usb_hcd *hcd) /* 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)) {