On Tue, Jan 27, 2015 at 07:06:14PM +0300, Sergei Shtylyov wrote: > Hello. > > On 01/27/2015 06:35 PM, Felipe Balbi wrote: > > >>>Fix using the bare numbers to set the 'wHubCharacteristics' field of the Hub > >>>Descriptor while the values are #define'd in <linux/usb/ch11.h>. > > >>>Signed-off-by: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx> > > >>>--- > >>> drivers/usb/musb/musb_virthub.c | 7 ++++--- > >>> 1 file changed, 4 insertions(+), 3 deletions(-) > > >>>Index: usb/drivers/usb/musb/musb_virthub.c > >>>=================================================================== > >>>--- usb.orig/drivers/usb/musb/musb_virthub.c > >>>+++ usb/drivers/usb/musb/musb_virthub.c > >>>@@ -349,9 +349,10 @@ int musb_hub_control( > >>> desc->bDescriptorType = 0x29; > >>> desc->bNbrPorts = 1; > >>> desc->wHubCharacteristics = cpu_to_le16( > >>>- 0x0001 /* per-port power switching */ > >>>- | 0x0010 /* no overcurrent reporting */ > >>>- ); > >>>+ HUB_CHAR_INDV_PORT_LPSM /* per-port power switching */ > >>>+ > > >> Ugh, don't know how this empty line sneaked into the patch. Greg, could > >>you please drop it? > > >fixed > > You mean you've merged the patch to your tree? If so, be prepared for the > conflict with Greg's tree since Greg has already merged the patch to his > 'usb-next' branch... Thanks anyway! musb goes through me, right ? :-) Conflicts are easy to solve, no problem. cheers -- balbi
Attachment:
signature.asc
Description: Digital signature
