[KJ] [PATCH] hcd.c

[KJ] [PATCH] hcd.c

[Carlo Perassi]

[-- Attachment #1: Type: text/plain, Size: 1047 bytes --]

Hi.

I know this patch is not a clean solution but without it I got the
following error

drivers/usb/core/hcd.c:131: error: parse error before '>>' token
drivers/usb/core/hcd.c:131: error: initializer element is not constant
drivers/usb/core/hcd.c:131: error: (near initialization for
`usb2_rh_dev_descrip
tor[12]')
drivers/usb/core/hcd.c:131: error: parse error before '>>' token
drivers/usb/core/hcd.c:131: error: initializer element is not constant
drivers/usb/core/hcd.c:131: error: (near initialization for
`usb2_rh_dev_descrip
tor[13]')
drivers/usb/core/hcd.c:154: error: parse error before '>>' token
drivers/usb/core/hcd.c:154: error: initializer element is not constant
drivers/usb/core/hcd.c:154: error: (near initialization for
`usb11_rh_dev_descri
ptor[12]')
drivers/usb/core/hcd.c:154: error: parse error before '>>' token
drivers/usb/core/hcd.c:154: error: initializer element is not constant
drivers/usb/core/hcd.c:154: error: (near initialization for
`usb11_rh_dev_descri
ptor[13]')

-- 
Carlo Perassi - http://www.linux.it/~carlo/

[-- Attachment #2: hcd.patch --]
[-- Type: application/octet-stream, Size: 1214 bytes --]

Signed-off-by: Carlo Perassi <carlo@linux.it>

---

--- linux-2.6.11/drivers/usb/core/hcd.c	2005-03-07 16:18:06.000000000 +0100
+++ linux-2.6.11-mod/drivers/usb/core/hcd.c	2005-03-07 16:18:56.000000000 +0100
@@ -112,9 +112,6 @@ DECLARE_WAIT_QUEUE_HEAD(usb_kill_urb_que
 
 /*-------------------------------------------------------------------------*/
 
-#define KERNEL_REL	((LINUX_VERSION_CODE >> 16) & 0x0ff)
-#define KERNEL_VER	((LINUX_VERSION_CODE >> 8) & 0x0ff)
-
 /* usb 2.0 root hub device descriptor */
 static const u8 usb2_rh_dev_descriptor [18] = {
 	0x12,       /*  __u8  bLength; */
@@ -128,7 +125,7 @@ static const u8 usb2_rh_dev_descriptor [
 
 	0x00, 0x00, /*  __le16 idVendor; */
  	0x00, 0x00, /*  __le16 idProduct; */
-	KERNEL_VER, KERNEL_REL, /*  __le16 bcdDevice */
+	0x02, 0x06, /*  __le16 bcdDevice */
 
 	0x03,       /*  __u8  iManufacturer; */
 	0x02,       /*  __u8  iProduct; */
@@ -151,7 +148,7 @@ static const u8 usb11_rh_dev_descriptor 
 
 	0x00, 0x00, /*  __le16 idVendor; */
  	0x00, 0x00, /*  __le16 idProduct; */
-	KERNEL_VER, KERNEL_REL, /*  __le16 bcdDevice */
+	0x02, 0x06, /*  __le16 bcdDevice */
 
 	0x03,       /*  __u8  iManufacturer; */
 	0x02,       /*  __u8  iProduct; */

[-- Attachment #3: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] hcd.c

[Adrian Bunk]

[-- Attachment #1: Type: text/plain, Size: 1516 bytes --]

On Mon, Mar 07, 2005 at 05:26:57PM +0100, Carlo Perassi wrote:

> Hi.

Hi Carlo,

> I know this patch is not a clean solution but without it I got the
> following error
> 
> drivers/usb/core/hcd.c:131: error: parse error before '>>' token
> drivers/usb/core/hcd.c:131: error: initializer element is not constant
> drivers/usb/core/hcd.c:131: error: (near initialization for
> `usb2_rh_dev_descrip
> tor[12]')
> drivers/usb/core/hcd.c:131: error: parse error before '>>' token
> drivers/usb/core/hcd.c:131: error: initializer element is not constant
> drivers/usb/core/hcd.c:131: error: (near initialization for
> `usb2_rh_dev_descrip
> tor[13]')
> drivers/usb/core/hcd.c:154: error: parse error before '>>' token
> drivers/usb/core/hcd.c:154: error: initializer element is not constant
> drivers/usb/core/hcd.c:154: error: (near initialization for
> `usb11_rh_dev_descri
> ptor[12]')
> drivers/usb/core/hcd.c:154: error: parse error before '>>' token
> drivers/usb/core/hcd.c:154: error: initializer element is not constant
> drivers/usb/core/hcd.c:154: error: (near initialization for
> `usb11_rh_dev_descri
> ptor[13]')

this is a completely unmodified ftp.kernel.org kernel?

If yes, please send:
- your .config
- the output of
    bash scripts/ver_linux

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed


[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] hcd.c

[Carlo Perassi]

[-- Attachment #1: Type: text/plain, Size: 426 bytes --]

> this is a completely unmodified ftp.kernel.org kernel?
> 
> If yes, please send:
> - your .config
> - the output of
>     bash scripts/ver_linux

I downloaded it from my usual mirror some days ago but before to send
the output of ver_linux I will try again with a fresh gcc compiled by
hand. If the problem will be still there, I will report it with some
details.
Thank you.

-- 
Carlo Perassi - http://www.linux.it/~carlo/

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] hcd.c

[Greg KH]

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

On Mon, Mar 07, 2005 at 05:26:57PM +0100, Carlo Perassi wrote:
> Hi.
> 
> I know this patch is not a clean solution but without it I got the
> following error

No, this patch is incorrect, please do a 'make clean' and then 'make'
and see if the error still happens.

thanks,

greg k-h

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors