Re: 2.6.25-rc6: CONFIG_USB_PERSIST forced on

[Linus Torvalds]

On Mon, 9 Jun 2008, Pavel Machek wrote:
> 
> With USB_PERSIST on, you have problem on all drivers but usb-storage,
> AFAICT... because usb-storage seems to be the only driver implementing
> reset_resume.

So let's *fix* it. It's not as if USB_PERSIST is new - it was there 
for well over a year. Disabling it yet again will obviously not fix 
*anything*.

> I guess it is possible to do something like "if reset_resume() is
> unavailable, try plain resume()" in usb/driver.c, but I'd really
> changes to the suspend/resume callback to go in -rc1 so that they are
> tested properly, and not hot-patch it now.

And how many people have actually even reported the problem? And how big 
do you seriously expect the patch to be?

This isn't even a regression - it's behavior that has always been there. 
It's just that now the behavior is much more exposed, and by being more 
exposed, people now see a bug that they didn't see before. Let's just try 
to *fix* it first, especially since the guesses about how to fix it have 
so far been fairly simple.

For example, if it's really just a "if we don't have a reset_resume() 
function, use the regular resume instead", does this trivial patch make a 
difference? I dunno, but it seems to be what people are saying we should 
just try. Much simpler than a revert.

		Linus

---
 drivers/usb/core/driver.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 1e56f1c..893a1fe 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -885,17 +885,11 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
 	}
 	driver = to_usb_driver(intf->dev.driver);
 
-	if (reset_resume) {
-		if (driver->reset_resume) {
-			status = driver->reset_resume(intf);
-			if (status)
-				dev_err(&intf->dev, "%s error %d\n",
-						"reset_resume", status);
-		} else {
-			/* status = -EOPNOTSUPP; */
-			dev_warn(&intf->dev, "no %s for driver %s?\n",
-					"reset_resume", driver->name);
-		}
+	if (reset_resume && driver->reset_resume) {
+		status = driver->reset_resume(intf);
+		if (status)
+			dev_err(&intf->dev, "%s error %d\n",
+					"reset_resume", status);
 	} else {
 		if (driver->resume) {
 			status = driver->resume(intf);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/