Commit 9076d4de authored by Johannes Stezenbach's avatar Johannes Stezenbach Committed by Linus Torvalds

[PATCH] dvb: follow USB __le16 changes

- dibusb: follow USB changes (idVendor, idProduct, bcdDevice and bcdUSB
  fields are now __le16)
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1ccfa52f
...@@ -363,8 +363,8 @@ static struct dibusb_usb_device * dibusb_find_device (struct usb_device *udev,in ...@@ -363,8 +363,8 @@ static struct dibusb_usb_device * dibusb_find_device (struct usb_device *udev,in
for (i = 0; i < sizeof(dibusb_devices)/sizeof(struct dibusb_usb_device); i++) { for (i = 0; i < sizeof(dibusb_devices)/sizeof(struct dibusb_usb_device); i++) {
for (j = 0; j < DIBUSB_ID_MAX_NUM && dibusb_devices[i].cold_ids[j] != NULL; j++) { for (j = 0; j < DIBUSB_ID_MAX_NUM && dibusb_devices[i].cold_ids[j] != NULL; j++) {
deb_info("check for cold %x %x\n",dibusb_devices[i].cold_ids[j]->idVendor, dibusb_devices[i].cold_ids[j]->idProduct); deb_info("check for cold %x %x\n",dibusb_devices[i].cold_ids[j]->idVendor, dibusb_devices[i].cold_ids[j]->idProduct);
if (dibusb_devices[i].cold_ids[j]->idVendor == udev->descriptor.idVendor && if (dibusb_devices[i].cold_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) &&
dibusb_devices[i].cold_ids[j]->idProduct == udev->descriptor.idProduct) { dibusb_devices[i].cold_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) {
*cold = 1; *cold = 1;
return &dibusb_devices[i]; return &dibusb_devices[i];
} }
...@@ -372,8 +372,8 @@ static struct dibusb_usb_device * dibusb_find_device (struct usb_device *udev,in ...@@ -372,8 +372,8 @@ static struct dibusb_usb_device * dibusb_find_device (struct usb_device *udev,in
for (j = 0; j < DIBUSB_ID_MAX_NUM && dibusb_devices[i].warm_ids[j] != NULL; j++) { for (j = 0; j < DIBUSB_ID_MAX_NUM && dibusb_devices[i].warm_ids[j] != NULL; j++) {
deb_info("check for warm %x %x\n",dibusb_devices[i].warm_ids[j]->idVendor, dibusb_devices[i].warm_ids[j]->idProduct); deb_info("check for warm %x %x\n",dibusb_devices[i].warm_ids[j]->idVendor, dibusb_devices[i].warm_ids[j]->idProduct);
if (dibusb_devices[i].warm_ids[j]->idVendor == udev->descriptor.idVendor && if (dibusb_devices[i].warm_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) &&
dibusb_devices[i].warm_ids[j]->idProduct == udev->descriptor.idProduct) { dibusb_devices[i].warm_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) {
*cold = 0; *cold = 0;
return &dibusb_devices[i]; return &dibusb_devices[i];
} }
...@@ -396,7 +396,7 @@ static int dibusb_probe(struct usb_interface *intf, ...@@ -396,7 +396,7 @@ static int dibusb_probe(struct usb_interface *intf,
if ((dibdev = dibusb_find_device(udev,&cold)) == NULL) { if ((dibdev = dibusb_find_device(udev,&cold)) == NULL) {
err("something went very wrong, " err("something went very wrong, "
"unknown product ID: %.4x",udev->descriptor.idProduct); "unknown product ID: %.4x",le16_to_cpu(udev->descriptor.idProduct));
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment