From: Johannes Stezenbach - dibusb: follow USB changes (idVendor, idProduct, bcdDevice and bcdUSB fields are now __le16) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton --- 25-akpm/drivers/media/dvb/dibusb/dvb-dibusb-core.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/media/dvb/dibusb/dvb-dibusb-core.c~dvb-follow-usb-__le16-changes drivers/media/dvb/dibusb/dvb-dibusb-core.c --- 25/drivers/media/dvb/dibusb/dvb-dibusb-core.c~dvb-follow-usb-__le16-changes 2005-01-25 21:19:23.291410880 -0800 +++ 25-akpm/drivers/media/dvb/dibusb/dvb-dibusb-core.c 2005-01-25 21:19:23.295410272 -0800 @@ -363,8 +363,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]; } @@ -372,8 +372,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]; } @@ -396,7 +396,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; } _