[PATCH] USB: musb: fix build error introduced by isoc change

[PATCH] USB: musb: fix build error introduced by isoc change

[Mike Frysinger]

From: Sonic Zhang <sonic.zhang@analog.com>

The recent commit "usb: musb: Fix for isochronous IN transfer" (f82a689fa)
seems to have been against an older kernel version.  It uses the old style
naming of variables.  Unfortunately, this breaks building for most MUSB
users out there since "bDesiredMode" has been renamed to "desired_mode".

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 drivers/usb/musb/musb_host.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index d21fffa..ef29f38 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1689,7 +1689,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 				dma->desired_mode = 1;
 			if (rx_count < hw_ep->max_packet_sz_rx) {
 				length = rx_count;
-				dma->bDesiredMode = 0;
+				dma->desired_mode = 0;
 			} else {
 				length = urb->transfer_buffer_length;
 			}
-- 
1.7.0

RE: [PATCH] USB: musb: fix build error introduced by isoc change

[Gadiyar, Anand]

Mike Frysinger wrote:
> 
> From: Sonic Zhang <sonic.zhang@analog.com>
> 
> The recent commit "usb: musb: Fix for isochronous IN transfer" (f82a689fa)
> seems to have been against an older kernel version.  It uses the old style
> naming of variables.  Unfortunately, this breaks building for most MUSB
> users out there since "bDesiredMode" has been renamed to "desired_mode".
> 

Looks like this code is under a "#ifdef USE_MODE1" check; that's why
we did not find this during regular builds. Felipe's upcoming patches
would make this code redundant anyway.

Till then, we might as well fix it.

> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

Acked-by: Anand Gadiyar <gadiyar@ti.com>

> ---
>  drivers/usb/musb/musb_host.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
> index d21fffa..ef29f38 100644
> --- a/drivers/usb/musb/musb_host.c
> +++ b/drivers/usb/musb/musb_host.c
> @@ -1689,7 +1689,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
>                                 dma->desired_mode = 1;
>                         if (rx_count < hw_ep->max_packet_sz_rx) {
>                                 length = rx_count;
> -                               dma->bDesiredMode = 0;
> +                               dma->desired_mode = 0;
>                         } else {
>                                 length = urb->transfer_buffer_length;
>                         }
> 

Re: [PATCH] USB: musb: fix build error introduced by isoc change

[Mike Frysinger]

On Mon, Mar 8, 2010 at 11:31, Gadiyar, Anand wrote:
> Mike Frysinger wrote:
>> From: Sonic Zhang <sonic.zhang@analog.com>
>>
>> The recent commit "usb: musb: Fix for isochronous IN transfer" (f82a689fa)
>> seems to have been against an older kernel version.  It uses the old style
>> naming of variables.  Unfortunately, this breaks building for most MUSB
>> users out there since "bDesiredMode" has been renamed to "desired_mode".
>>
>
> Looks like this code is under a "#ifdef USE_MODE1" check; that's why
> we did not find this during regular builds.

ah, ok.  Felipe should tweak the changelog to mention this when merging ;)

> Felipe's upcoming patches would make this code redundant anyway.
>
> Till then, we might as well fix it.

right ... this at least should go into 2.6.33.x
-mike

Re: [PATCH] USB: musb: fix build error introduced by isoc change

[Felipe Balbi]

On Mon, Mar 08, 2010 at 10:01:45PM +0530, Gadiyar, Anand wrote:
> Mike Frysinger wrote:
> > 
> > From: Sonic Zhang <sonic.zhang@analog.com>
> > 
> > The recent commit "usb: musb: Fix for isochronous IN transfer" (f82a689fa)
> > seems to have been against an older kernel version.  It uses the old style
> > naming of variables.  Unfortunately, this breaks building for most MUSB
> > users out there since "bDesiredMode" has been renamed to "desired_mode".
> > 
> 
> Looks like this code is under a "#ifdef USE_MODE1" check; that's why
> we did not find this during regular builds. Felipe's upcoming patches
> would make this code redundant anyway.
> 
> Till then, we might as well fix it.

yes, it was my bad. I should have reviewed the code more carefully. We
will be testing the mode1 support on DaVinci during this and the next
week and when we get it working, we will publish the mode1 dma changes
again which will completely change this code.

> > Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
> > Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> 
> Acked-by: Anand Gadiyar <gadiyar@ti.com>

Acked-by: Felipe Balbi <felipe.balbi@nokia.com>

-- 
balbi

Re: [PATCH] USB: musb: fix build error introduced by isoc change

[Felipe Balbi]

On Mon, Mar 08, 2010 at 05:26:01PM +0100, ext Mike Frysinger wrote:
>From: Sonic Zhang <sonic.zhang@analog.com>
>
>The recent commit "usb: musb: Fix for isochronous IN transfer" (f82a689fa)
>seems to have been against an older kernel version.  It uses the old style
>naming of variables.  Unfortunately, this breaks building for most MUSB
>users out there since "bDesiredMode" has been renamed to "desired_mode".
>
>Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
>Signed-off-by: Mike Frysinger <vapier@gentoo.org>

applied, thanks

-- 
balbi