* [patch] USB: chipidea: fix & vs | bug
@ 2012-09-14 6:50 Dan Carpenter
2012-09-14 6:58 ` Richard Zhao
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Dan Carpenter @ 2012-09-14 6:50 UTC (permalink / raw)
To: kernel-janitors
There is a '&' vs '|' typo in the original code so the condition is
never true and we don't queue the work.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 2f45bba..5294f81 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1680,7 +1680,7 @@ static irqreturn_t udc_irq(struct ci13xxx *ci)
intr = hw_read(ci, OP_OTGSC, ~0);
hw_write(ci, OP_OTGSC, ~0, intr);
- if (intr & (OTGSC_AVVIE & OTGSC_AVVIS))
+ if (intr & (OTGSC_AVVIE | OTGSC_AVVIS))
queue_work(ci->wq, &ci->vbus_work);
spin_unlock(&ci->lock);
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [patch] USB: chipidea: fix & vs | bug
2012-09-14 6:50 [patch] USB: chipidea: fix & vs | bug Dan Carpenter
@ 2012-09-14 6:58 ` Richard Zhao
2013-02-15 10:26 ` Dan Carpenter
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Richard Zhao @ 2012-09-14 6:58 UTC (permalink / raw)
To: kernel-janitors
On Fri, Sep 14, 2012 at 09:50:56AM +0300, Dan Carpenter wrote:
> There is a '&' vs '|' typo in the original code so the condition is
> never true and we don't queue the work.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>
> diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> index 2f45bba..5294f81 100644
> --- a/drivers/usb/chipidea/udc.c
> +++ b/drivers/usb/chipidea/udc.c
> @@ -1680,7 +1680,7 @@ static irqreturn_t udc_irq(struct ci13xxx *ci)
> intr = hw_read(ci, OP_OTGSC, ~0);
> hw_write(ci, OP_OTGSC, ~0, intr);
>
> - if (intr & (OTGSC_AVVIE & OTGSC_AVVIS))
> + if (intr & (OTGSC_AVVIE | OTGSC_AVVIS))
It's not what I meant. Should be
if ((intr & OTGSC_AVVIE) && (intr & OTGSC_AVVIS))
I'm still testing it.
Thanks
Richard
> queue_work(ci->wq, &ci->vbus_work);
>
> spin_unlock(&ci->lock);
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch] USB: chipidea: fix & vs | bug
2012-09-14 6:50 [patch] USB: chipidea: fix & vs | bug Dan Carpenter
2012-09-14 6:58 ` Richard Zhao
@ 2013-02-15 10:26 ` Dan Carpenter
2013-02-15 11:08 ` Dan Carpenter
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Dan Carpenter @ 2013-02-15 10:26 UTC (permalink / raw)
To: kernel-janitors
On Fri, Sep 14, 2012 at 02:58:20PM +0800, Richard Zhao wrote:
> On Fri, Sep 14, 2012 at 09:50:56AM +0300, Dan Carpenter wrote:
> > There is a '&' vs '|' typo in the original code so the condition is
> > never true and we don't queue the work.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> >
> > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> > index 2f45bba..5294f81 100644
> > --- a/drivers/usb/chipidea/udc.c
> > +++ b/drivers/usb/chipidea/udc.c
> > @@ -1680,7 +1680,7 @@ static irqreturn_t udc_irq(struct ci13xxx *ci)
> > intr = hw_read(ci, OP_OTGSC, ~0);
> > hw_write(ci, OP_OTGSC, ~0, intr);
> >
> > - if (intr & (OTGSC_AVVIE & OTGSC_AVVIS))
> > + if (intr & (OTGSC_AVVIE | OTGSC_AVVIS))
> It's not what I meant. Should be
> if ((intr & OTGSC_AVVIE) && (intr & OTGSC_AVVIS))
> I'm still testing it.
How did the testing go?
regards,
dan carpenter
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch] USB: chipidea: fix & vs | bug
2012-09-14 6:50 [patch] USB: chipidea: fix & vs | bug Dan Carpenter
2012-09-14 6:58 ` Richard Zhao
2013-02-15 10:26 ` Dan Carpenter
@ 2013-02-15 11:08 ` Dan Carpenter
2013-02-15 12:54 ` Alexander Shishkin
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Dan Carpenter @ 2013-02-15 11:08 UTC (permalink / raw)
To: kernel-janitors
On Fri, Feb 15, 2013 at 01:26:29PM +0300, Dan Carpenter wrote:
> On Fri, Sep 14, 2012 at 02:58:20PM +0800, Richard Zhao wrote:
> > On Fri, Sep 14, 2012 at 09:50:56AM +0300, Dan Carpenter wrote:
> > > There is a '&' vs '|' typo in the original code so the condition is
> > > never true and we don't queue the work.
> > >
> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > > ---
> > >
> > > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> > > index 2f45bba..5294f81 100644
> > > --- a/drivers/usb/chipidea/udc.c
> > > +++ b/drivers/usb/chipidea/udc.c
> > > @@ -1680,7 +1680,7 @@ static irqreturn_t udc_irq(struct ci13xxx *ci)
> > > intr = hw_read(ci, OP_OTGSC, ~0);
> > > hw_write(ci, OP_OTGSC, ~0, intr);
> > >
> > > - if (intr & (OTGSC_AVVIE & OTGSC_AVVIS))
> > > + if (intr & (OTGSC_AVVIE | OTGSC_AVVIS))
> > It's not what I meant. Should be
> > if ((intr & OTGSC_AVVIE) && (intr & OTGSC_AVVIS))
> > I'm still testing it.
>
> How did the testing go?
>
Richard's email is bouncing. Probably I should just send this
myself.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch] USB: chipidea: fix & vs | bug
2012-09-14 6:50 [patch] USB: chipidea: fix & vs | bug Dan Carpenter
` (2 preceding siblings ...)
2013-02-15 11:08 ` Dan Carpenter
@ 2013-02-15 12:54 ` Alexander Shishkin
2013-02-15 13:18 ` Dan Carpenter
2013-02-15 13:37 ` Alexander Shishkin
5 siblings, 0 replies; 7+ messages in thread
From: Alexander Shishkin @ 2013-02-15 12:54 UTC (permalink / raw)
To: kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> writes:
> On Fri, Feb 15, 2013 at 01:26:29PM +0300, Dan Carpenter wrote:
>> On Fri, Sep 14, 2012 at 02:58:20PM +0800, Richard Zhao wrote:
>> > On Fri, Sep 14, 2012 at 09:50:56AM +0300, Dan Carpenter wrote:
>> > > There is a '&' vs '|' typo in the original code so the condition is
>> > > never true and we don't queue the work.
>> > >
>> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>> > > ---
>> > >
>> > > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
>> > > index 2f45bba..5294f81 100644
>> > > --- a/drivers/usb/chipidea/udc.c
>> > > +++ b/drivers/usb/chipidea/udc.c
>> > > @@ -1680,7 +1680,7 @@ static irqreturn_t udc_irq(struct ci13xxx *ci)
>> > > intr = hw_read(ci, OP_OTGSC, ~0);
>> > > hw_write(ci, OP_OTGSC, ~0, intr);
>> > >
>> > > - if (intr & (OTGSC_AVVIE & OTGSC_AVVIS))
>> > > + if (intr & (OTGSC_AVVIE | OTGSC_AVVIS))
>> > It's not what I meant. Should be
>> > if ((intr & OTGSC_AVVIE) && (intr & OTGSC_AVVIS))
>> > I'm still testing it.
>>
>> How did the testing go?
>>
>
> Richard's email is bouncing. Probably I should just send this
> myself.
We're reverting this commit for 3.10 as part of Peter's vbus detection
patchset. If it seems more urgent, I guess we can revert it earlier as a
bugfix. Otherwise, I'd just leave it till 3.10.
Regards,
--
Alex
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch] USB: chipidea: fix & vs | bug
2012-09-14 6:50 [patch] USB: chipidea: fix & vs | bug Dan Carpenter
` (3 preceding siblings ...)
2013-02-15 12:54 ` Alexander Shishkin
@ 2013-02-15 13:18 ` Dan Carpenter
2013-02-15 13:37 ` Alexander Shishkin
5 siblings, 0 replies; 7+ messages in thread
From: Dan Carpenter @ 2013-02-15 13:18 UTC (permalink / raw)
To: kernel-janitors
On Fri, Feb 15, 2013 at 02:54:56PM +0200, Alexander Shishkin wrote:
> Dan Carpenter <dan.carpenter@oracle.com> writes:
>
> > On Fri, Feb 15, 2013 at 01:26:29PM +0300, Dan Carpenter wrote:
> >> On Fri, Sep 14, 2012 at 02:58:20PM +0800, Richard Zhao wrote:
> >> > On Fri, Sep 14, 2012 at 09:50:56AM +0300, Dan Carpenter wrote:
> >> > > There is a '&' vs '|' typo in the original code so the condition is
> >> > > never true and we don't queue the work.
> >> > >
> >> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >> > > ---
> >> > >
> >> > > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> >> > > index 2f45bba..5294f81 100644
> >> > > --- a/drivers/usb/chipidea/udc.c
> >> > > +++ b/drivers/usb/chipidea/udc.c
> >> > > @@ -1680,7 +1680,7 @@ static irqreturn_t udc_irq(struct ci13xxx *ci)
> >> > > intr = hw_read(ci, OP_OTGSC, ~0);
> >> > > hw_write(ci, OP_OTGSC, ~0, intr);
> >> > >
> >> > > - if (intr & (OTGSC_AVVIE & OTGSC_AVVIS))
> >> > > + if (intr & (OTGSC_AVVIE | OTGSC_AVVIS))
> >> > It's not what I meant. Should be
> >> > if ((intr & OTGSC_AVVIE) && (intr & OTGSC_AVVIS))
> >> > I'm still testing it.
> >>
> >> How did the testing go?
> >>
> >
> > Richard's email is bouncing. Probably I should just send this
> > myself.
>
> We're reverting this commit for 3.10 as part of Peter's vbus detection
> patchset. If it seems more urgent, I guess we can revert it earlier as a
> bugfix. Otherwise, I'd just leave it till 3.10.
No rush. It's just a static checker thing.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch] USB: chipidea: fix & vs | bug
2012-09-14 6:50 [patch] USB: chipidea: fix & vs | bug Dan Carpenter
` (4 preceding siblings ...)
2013-02-15 13:18 ` Dan Carpenter
@ 2013-02-15 13:37 ` Alexander Shishkin
5 siblings, 0 replies; 7+ messages in thread
From: Alexander Shishkin @ 2013-02-15 13:37 UTC (permalink / raw)
To: kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> writes:
> On Fri, Feb 15, 2013 at 02:54:56PM +0200, Alexander Shishkin wrote:
>> Dan Carpenter <dan.carpenter@oracle.com> writes:
>>
>> > On Fri, Feb 15, 2013 at 01:26:29PM +0300, Dan Carpenter wrote:
>> >> On Fri, Sep 14, 2012 at 02:58:20PM +0800, Richard Zhao wrote:
>> >> > On Fri, Sep 14, 2012 at 09:50:56AM +0300, Dan Carpenter wrote:
>> >> > > There is a '&' vs '|' typo in the original code so the condition is
>> >> > > never true and we don't queue the work.
>> >> > >
>> >> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>> >> > > ---
>> >> > >
>> >> > > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
>> >> > > index 2f45bba..5294f81 100644
>> >> > > --- a/drivers/usb/chipidea/udc.c
>> >> > > +++ b/drivers/usb/chipidea/udc.c
>> >> > > @@ -1680,7 +1680,7 @@ static irqreturn_t udc_irq(struct ci13xxx *ci)
>> >> > > intr = hw_read(ci, OP_OTGSC, ~0);
>> >> > > hw_write(ci, OP_OTGSC, ~0, intr);
>> >> > >
>> >> > > - if (intr & (OTGSC_AVVIE & OTGSC_AVVIS))
>> >> > > + if (intr & (OTGSC_AVVIE | OTGSC_AVVIS))
>> >> > It's not what I meant. Should be
>> >> > if ((intr & OTGSC_AVVIE) && (intr & OTGSC_AVVIS))
>> >> > I'm still testing it.
>> >>
>> >> How did the testing go?
>> >>
>> >
>> > Richard's email is bouncing. Probably I should just send this
>> > myself.
>>
>> We're reverting this commit for 3.10 as part of Peter's vbus detection
>> patchset. If it seems more urgent, I guess we can revert it earlier as a
>> bugfix. Otherwise, I'd just leave it till 3.10.
>
> No rush. It's just a static checker thing.
Ok, thanks.
Regards,
--
Alex
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-02-15 13:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-14 6:50 [patch] USB: chipidea: fix & vs | bug Dan Carpenter
2012-09-14 6:58 ` Richard Zhao
2013-02-15 10:26 ` Dan Carpenter
2013-02-15 11:08 ` Dan Carpenter
2013-02-15 12:54 ` Alexander Shishkin
2013-02-15 13:18 ` Dan Carpenter
2013-02-15 13:37 ` Alexander Shishkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox