On Mon, 28 Jan 2013, Florian Fainelli wrote: > This patch adds an ignore_oc flag which can be set by EHCI controller > not supporting or wanting to disable overcurrent checking. The EHCI > platform data in include/linux/usb/ehci_pdriver.h is also augmented to > take advantage of this new flag. > > Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx> > --- > drivers/usb/host/ehci-hcd.c | 2 +- > drivers/usb/host/ehci-hub.c | 4 ++-- > drivers/usb/host/ehci.h | 1 + > include/linux/usb/ehci_pdriver.h | 1 + > 4 files changed, 5 insertions(+), 3 deletions(-) You forgot to add ehci->ignore_oc = pdata->ignore_oc; to ehci_platform_reset(). This makes me wonder: Either the patches were not tested very well or else the new ignore_oc stuff isn't needed. > diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c > index c97503b..bd435ac 100644 > --- a/drivers/usb/host/ehci-hcd.c > +++ b/drivers/usb/host/ehci-hcd.c > @@ -634,7 +634,7 @@ static int ehci_run (struct usb_hcd *hcd) > "USB %x.%x started, EHCI %x.%02x%s\n", > ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), > temp >> 8, temp & 0xff, > - ignore_oc ? ", overcurrent ignored" : ""); > + (ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : ""); You could simplify the code here and other places if you add ehci->ignore_oc ||= ignore_oc; to ehci_init(). Then you wouldn't need to test ignore_oc all the time. Alan Stern
