From a46694e6d07efe76d811136311befee41954d4ff Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 22 May 2009 06:46:42 +0000 Subject: [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 --- target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c') 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 9d49664cb..0ccf829c2 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 */ -- cgit v1.2.3