usbatm cxacru.c,1.18,1.19

kagan at infradead.org kagan at infradead.org
Fri Mar 4 07:33:50 EST 2005


Update of /home/cvs/usbatm
In directory phoenix.infradead.org:/tmp/cvs-serv10521

Modified Files:
	cxacru.c 
Log Message:
Fix the byte order in the signature made of (vendor, product)

Index: cxacru.c
===================================================================
RCS file: /home/cvs/usbatm/cxacru.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cxacru.c	4 Mar 2005 11:30:57 -0000	1.18
+++ cxacru.c	4 Mar 2005 12:33:46 -0000	1.19
@@ -516,8 +516,7 @@
 	int off;
 	struct usb_device *usb_dev = instance->usbatm->usb_dev;
 	struct device *dev = &instance->usbatm->usb_intf->dev;
-	u32 signature = le16_to_cpu(usb_dev->descriptor.idVendor) |
-			(le16_to_cpu(usb_dev->descriptor.idProduct) << 16);
+	u16 signature[] = { usb_dev->descriptor.idVendor, usb_dev->descriptor.idProduct };
 	u32 val;
 
 	dbg("cxacru_upload_firmware");
@@ -563,7 +562,7 @@
 	}
 
 	/* Signature */
-	ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, SIG_ADDR, (u8 *) &signature, 4);
+	ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, SIG_ADDR, (u8 *) signature, 4);
 	if (ret) {
 		dev_err(dev, "Signature storing failed: %d\n", ret);
 		return;




More information about the Usbatm-commits mailing list