This is a note to let you know that I've just added the patch titled

    USB: storage: properly handle the endian issues of idProduct

to my usb git tree which can be found at
    git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-next branch.

The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)

The patch will also be merged in the next major kernel release
during the merge window.

If you have any questions about this process, please let me know.


>From cd060956c5e97931c3909e4a808508469c0bb9f6 Mon Sep 17 00:00:00 2001
From: fangxiaozhi <[email protected]>
Date: Thu, 7 Feb 2013 15:32:07 +0800
Subject: USB: storage: properly handle the endian issues of idProduct

1. The idProduct is little endian, so make sure its value to be
compatible with the current CPU. Make no break on big endian processors.

Signed-off-by: fangxiaozhi <[email protected]>
Cc: stable <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/usb/storage/initializers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/storage/initializers.c 
b/drivers/usb/storage/initializers.c
index 16b0bf0..7ab9046 100644
--- a/drivers/usb/storage/initializers.c
+++ b/drivers/usb/storage/initializers.c
@@ -147,7 +147,7 @@ static int usb_stor_huawei_dongles_pid(struct us_data *us)
        int idProduct;
 
        idesc = &us->pusb_intf->cur_altsetting->desc;
-       idProduct = us->pusb_dev->descriptor.idProduct;
+       idProduct = le16_to_cpu(us->pusb_dev->descriptor.idProduct);
        /* The first port is CDROM,
         * means the dongle in the single port mode,
         * and a switch command is required to be sent. */
@@ -169,7 +169,7 @@ int usb_stor_huawei_init(struct us_data *us)
        int result = 0;
 
        if (usb_stor_huawei_dongles_pid(us)) {
-               if (us->pusb_dev->descriptor.idProduct >= 0x1446)
+               if (le16_to_cpu(us->pusb_dev->descriptor.idProduct) >= 0x1446)
                        result = usb_stor_huawei_scsi_init(us);
                else
                        result = usb_stor_huawei_feature_init(us);
-- 
1.8.1.rc1.5.g7e0651a


--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to