Re: [linux-usb-devel] [PATCH] USB: consolidate error values from EHCI, UHCI and OHCI _suspend()

From: David Brownell
Date: Mon Sep 18 2006 - 22:11:47 EST


On Monday 18 September 2006 6:44 pm, Jiri Kosina wrote:
> Hi,
>
> EHCI, UHCI and OHCI USB host drivers are not consistent when returining
> error values from their _suspend() functions, in case that the device is
> not in suspended state. This could confuse users, so let all three of them
> return -EBUSY.

Shouldn't you also update uhci_suspend()? Currently it
just ignores hcd->state ...


> Patch against 2.6.18-rc6-mm2.
>
> Signed-off-by: Jiri Kosina <jikos@xxxxxxxx>
>
> --- linux-2.6.18-rc6-mm2.orig/drivers/usb/host/ehci-pci.c 2006-09-14 16:20:48.000000000 +0200
> +++ linux-2.6.18-rc6-mm2/drivers/usb/host/ehci-pci.c 2006-09-19 03:20:22.000000000 +0200
> @@ -232,7 +232,7 @@ static int ehci_pci_suspend(struct usb_h
> */
> spin_lock_irqsave (&ehci->lock, flags);
> if (hcd->state != HC_STATE_SUSPENDED) {
> - rc = -EINVAL;
> + rc = -EBUSY;
> goto bail;
> }
> writel (0, &ehci->regs->intr_enable);
> --- linux-2.6.18-rc6-mm2.orig/drivers/usb/host/ohci-pci.c 2006-09-14 16:20:48.000000000 +0200
> +++ linux-2.6.18-rc6-mm2/drivers/usb/host/ohci-pci.c 2006-09-19 03:36:35.000000000 +0200
> @@ -130,7 +130,7 @@ static int ohci_pci_suspend (struct usb_
> */
> spin_lock_irqsave (&ohci->lock, flags);
> if (hcd->state != HC_STATE_SUSPENDED) {
> - rc = -EINVAL;
> + rc = -EBUSY;
> goto bail;
> }
> ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
>
> --
> Jiri Kosina
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share your
> opinions on IT & business topics through brief surveys -- and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> linux-usb-devel@xxxxxxxxxxxxxxxxxxxxx
> To unsubscribe, use the last form field at:
> https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
>
-
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/