LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Alan Stern <stern@rowland.harvard.edu>
To: Christian Kujau <lists@nerdbynature.de>
Cc: David Brownell <david-b@pacbell.net>,
LKML <linux-kernel@vger.kernel.org>, <0x0007@gmail.com>,
USB list <linux-usb@vger.kernel.org>
Subject: Re: WARNING: at drivers/usb/host/ehci-hcd.c:287
Date: Tue, 4 Mar 2008 15:27:04 -0500 (EST) [thread overview]
Message-ID: <Pine.LNX.4.44L0.0803041525570.15190-100000@iolanthe.rowland.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0803041948230.5974@sheep.housecafe.de>
On Tue, 4 Mar 2008, Christian Kujau wrote:
> I'm not sure, but do you mean:
>
> --- linux-2.6/drivers/usb/host/ehci-hcd.c 2008-02-24 22:25:54.000000000 +0100
> +++ linux-2.6/drivers/usb/host/ehci-hcd.c.edited 2008-03-04 19:46:13.000000000 +0100
> @@ -284,7 +284,10 @@ static void ehci_iaa_watchdog(unsigned l
> u32 status, cmd;
>
> spin_lock_irqsave (&ehci->lock, flags);
> - WARN_ON(!ehci->reclaim);
> + if (unlikely(!ehci->reclaim ||
> + !HC_IS_RUNNING(ehci_to_hcd(ehci)->state) ||
> + timer_pending(&ehci->iaa_watchdog))
> + goto done;
>
> status = ehci_readl(ehci, &ehci->regs->status);
> cmd = ehci_readl(ehci, &ehci->regs->command);
Almost. I meant:
Index: usb-2.6/drivers/usb/host/ehci-hcd.c
===================================================================
--- usb-2.6.orig/drivers/usb/host/ehci-hcd.c
+++ usb-2.6/drivers/usb/host/ehci-hcd.c
@@ -260,7 +260,10 @@ static void ehci_iaa_watchdog(unsigned l
u32 status, cmd;
spin_lock_irqsave (&ehci->lock, flags);
- WARN_ON(!ehci->reclaim);
+ if (unlikely(!ehci->reclaim ||
+ !HC_IS_RUNNING(ehci_to_hcd(ehci)->state) ||
+ timer_pending(&ehci->iaa_watchdog))
+ goto done;
status = ehci_readl(ehci, &ehci->regs->status);
cmd = ehci_readl(ehci, &ehci->regs->command);
@@ -276,7 +279,7 @@ static void ehci_iaa_watchdog(unsigned l
ehci_writel(ehci, cmd & ~CMD_IAAD, &ehci->regs->command);
end_unlink_async(ehci);
}
-
+ done:
spin_unlock_irqrestore(&ehci->lock, flags);
}
next prev parent reply other threads:[~2008-03-04 20:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-03 0:05 Christian Kujau
2008-03-03 22:38 ` Christian Kujau
2008-03-04 16:29 ` Alan Stern
2008-03-04 18:53 ` Christian Kujau
2008-03-04 20:27 ` Alan Stern [this message]
2008-03-04 20:51 ` David Brownell
2008-03-04 20:57 ` Alan Stern
2008-03-04 22:01 ` David Brownell
2008-03-04 23:15 ` Christian Kujau
2008-03-05 0:30 ` David Brownell
2008-03-05 1:15 ` Christian Kujau
2008-03-05 4:25 ` David Brownell
2008-03-05 22:59 ` Christian Kujau
2008-03-07 19:51 ` Christian Kujau
2008-03-04 7:49 ` Andrew Morton
2008-03-04 8:01 ` Christian Kujau
2008-03-04 8:10 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.44L0.0803041525570.15190-100000@iolanthe.rowland.org \
--to=stern@rowland.harvard.edu \
--cc=0x0007@gmail.com \
--cc=david-b@pacbell.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=lists@nerdbynature.de \
--subject='Re: WARNING: at drivers/usb/host/ehci-hcd.c:287' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).