diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-05-22 06:46:42 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-05-22 06:46:42 +0000 |
| commit | 17bfab8e1595b2b72b063ae502165f48c0e61767 (patch) | |
| tree | 1fecf70223aade7526180b07ae08de2c2c65342a /target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c | |
| parent | 632adabfafb512275360c5bcb6bd9de78131ade7 (diff) | |
| download | upstream-17bfab8e1595b2b72b063ae502165f48c0e61767.tar.gz upstream-17bfab8e1595b2b72b063ae502165f48c0e61767.tar.bz2 upstream-17bfab8e1595b2b72b063ae502165f48c0e61767.zip | |
[adm5120] integrate 2.6.28 specific patch into the usb driver
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15975 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c')
| -rw-r--r-- | target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c index 9d49664cba..0ccf829c2d 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c @@ -432,13 +432,17 @@ static inline int admhc_rh_resume(struct admhcd *ahcd) static int admhc_root_hub_state_changes(struct admhcd *ahcd, int changed, int any_connected) { - int poll_rh = 1; - - /* keep on polling until RHSC is enabled */ + /* If INSM is enabled, don't poll */ if (admhc_readl(ahcd, &ahcd->regs->int_enable) & ADMHC_INTR_INSM) - poll_rh = 0; + return 0; - return poll_rh; + /* If no status changes are pending, enable status-change interrupts */ + if (!changed) { + admhc_intr_enable(ahcd, ADMHC_INTR_INSM); + return 0; + } + + return 1; } #endif /* CONFIG_PM */ |