- [DVB] dibusb: follow USB changes (idVendor, idProduct, bcdDevice
and bcdUSB fields are now __le16)
Signed-off-by: Johannes Stezenbach <[EMAIL PROTECTED]>
diff -rupN linux-2.6.11-rc2-mm1/drivers/media/dvb/dibusb/dvb-dibusb-core.c
linux-2.6.11-rc2-mm1-dvb/drivers/media/dvb/dibusb/dvb-dibusb-core.c
--- linux-2.6.11-rc2-mm1/drivers/media/dvb/dibusb/dvb-dibusb-core.c
2005-01-24 23:31:05.000000000 +0100
+++ linux-2.6.11-rc2-mm1-dvb/drivers/media/dvb/dibusb/dvb-dibusb-core.c
2005-01-24 23:16:27.000000000 +0100
@@ -358,8 +360,8 @@ static struct dibusb_usb_device * dibusb
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++) {
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 &&
- dibusb_devices[i].cold_ids[j]->idProduct ==
udev->descriptor.idProduct) {
+ if (dibusb_devices[i].cold_ids[j]->idVendor ==
le16_to_cpu(udev->descriptor.idVendor) &&
+ dibusb_devices[i].cold_ids[j]->idProduct ==
le16_to_cpu(udev->descriptor.idProduct)) {
*cold = 1;
return &dibusb_devices[i];
}
@@ -367,8 +369,8 @@ static struct dibusb_usb_device * dibusb
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);
- if (dibusb_devices[i].warm_ids[j]->idVendor ==
udev->descriptor.idVendor &&
- dibusb_devices[i].warm_ids[j]->idProduct ==
udev->descriptor.idProduct) {
+ if (dibusb_devices[i].warm_ids[j]->idVendor ==
le16_to_cpu(udev->descriptor.idVendor) &&
+ dibusb_devices[i].warm_ids[j]->idProduct ==
le16_to_cpu(udev->descriptor.idProduct)) {
*cold = 0;
return &dibusb_devices[i];
}
@@ -391,7 +393,7 @@ static int dibusb_probe(struct usb_inter
if ((dibdev = dibusb_find_device(udev,&cold)) == NULL) {
err("something went very wrong, "
- "unknown product ID:
%.4x",udev->descriptor.idProduct);
+ "unknown product ID:
%.4x",le16_to_cpu(udev->descriptor.idProduct));
return -ENODEV;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
