[PATCH] fix "&& 0x03" obvious typo in net1080

[PATCH] fix "&& 0x03" obvious typo in net1080

[Willy Tarreau]

Hi David,

I found this bug while grepping for "&& 0x" in drivers.
Care to forward upstream ?

Regards,
Willy

>From e9b19b98763726db99237ccfea907cf88d3572ac Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 19 Nov 2006 15:30:11 +0100
Subject: [PATCH] fix "&& 0x03" obvious typo in net1080

Another obvious occurrence of this typo.

Signed-off-by: Willy Tarreau <w@1wt.eu>
---
 drivers/usb/net/net1080.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c
index ce00de8..a774105 100644
--- a/drivers/usb/net/net1080.c
+++ b/drivers/usb/net/net1080.c
@@ -237,12 +237,12 @@ #define	STATUS_PORT_A		(1 << 15)
 #define	STATUS_CONN_OTHER	(1 << 14)
 #define	STATUS_SUSPEND_OTHER	(1 << 13)
 #define	STATUS_MAILBOX_OTHER	(1 << 12)
-#define	STATUS_PACKETS_OTHER(n)	(((n) >> 8) && 0x03)
+#define	STATUS_PACKETS_OTHER(n)	(((n) >> 8) & 0x03)
 
 #define	STATUS_CONN_THIS	(1 << 6)
 #define	STATUS_SUSPEND_THIS	(1 << 5)
 #define	STATUS_MAILBOX_THIS	(1 << 4)
-#define	STATUS_PACKETS_THIS(n)	(((n) >> 0) && 0x03)
+#define	STATUS_PACKETS_THIS(n)	(((n) >> 0) & 0x03)
 
 #define	STATUS_UNSPEC_MASK	0x0c8c
 #define	STATUS_NOISE_MASK 	((u16)~(0x0303|STATUS_UNSPEC_MASK))
-- 
1.4.2.4

Re: [PATCH] fix "&& 0x03" obvious typo in net1080

[David Brownell]

On Sunday 19 November 2006 6:33 am, Willy Tarreau wrote:
> Hi David,
> 
> I found this bug while grepping for "&& 0x" in drivers.
> Care to forward upstream ?

I thought this already _was_ upstream ... Greg?


> Regards,
> Willy
> 
> >From e9b19b98763726db99237ccfea907cf88d3572ac Mon Sep 17 00:00:00 2001
> From: Willy Tarreau <w@1wt.eu>
> Date: Sun, 19 Nov 2006 15:30:11 +0100
> Subject: [PATCH] fix "&& 0x03" obvious typo in net1080
> 
> Another obvious occurrence of this typo.
> 
> Signed-off-by: Willy Tarreau <w@1wt.eu>
> ---
>  drivers/usb/net/net1080.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c
> index ce00de8..a774105 100644
> --- a/drivers/usb/net/net1080.c
> +++ b/drivers/usb/net/net1080.c
> @@ -237,12 +237,12 @@ #define	STATUS_PORT_A		(1 << 15)
>  #define	STATUS_CONN_OTHER	(1 << 14)
>  #define	STATUS_SUSPEND_OTHER	(1 << 13)
>  #define	STATUS_MAILBOX_OTHER	(1 << 12)
> -#define	STATUS_PACKETS_OTHER(n)	(((n) >> 8) && 0x03)
> +#define	STATUS_PACKETS_OTHER(n)	(((n) >> 8) & 0x03)
>  
>  #define	STATUS_CONN_THIS	(1 << 6)
>  #define	STATUS_SUSPEND_THIS	(1 << 5)
>  #define	STATUS_MAILBOX_THIS	(1 << 4)
> -#define	STATUS_PACKETS_THIS(n)	(((n) >> 0) && 0x03)
> +#define	STATUS_PACKETS_THIS(n)	(((n) >> 0) & 0x03)
>  
>  #define	STATUS_UNSPEC_MASK	0x0c8c
>  #define	STATUS_NOISE_MASK 	((u16)~(0x0303|STATUS_UNSPEC_MASK))
> -- 
> 1.4.2.4
> 

Re: [PATCH] fix "&& 0x03" obvious typo in net1080

[Greg KH]

On Mon, Nov 20, 2006 at 06:52:19PM -0800, David Brownell wrote:
> On Sunday 19 November 2006 6:33 am, Willy Tarreau wrote:
> > Hi David,
> > 
> > I found this bug while grepping for "&& 0x" in drivers.
> > Care to forward upstream ?
> 
> I thought this already _was_ upstream ... Greg?

It's in my tree, and in the next -mm.  I didn't send it to Linus for
2.6.19, as it's only a debug issue, like you mentioned.

So it's in the pipeline...

thanks,

greg k-h

Re: [PATCH] fix "&& 0x03" obvious typo in net1080

[Willy Tarreau]

On Mon, Nov 20, 2006 at 08:29:25PM -0800, Greg KH wrote:
> On Mon, Nov 20, 2006 at 06:52:19PM -0800, David Brownell wrote:
> > On Sunday 19 November 2006 6:33 am, Willy Tarreau wrote:
> > > Hi David,
> > > 
> > > I found this bug while grepping for "&& 0x" in drivers.
> > > Care to forward upstream ?
> > 
> > I thought this already _was_ upstream ... Greg?
> 
> It's in my tree, and in the next -mm.  I didn't send it to Linus for
> 2.6.19, as it's only a debug issue, like you mentioned.
> 
> So it's in the pipeline...

OK, that explains why I did not find it fixed first :-)

Thanks guys,
Willy