r65 - unstable/rt2x00/debian/patches

[benh at alioth.debian.org]

Author: benh
Date: 2007-10-31 23:41:18 +0000 (Wed, 31 Oct 2007)
New Revision: 65

Modified:
   unstable/rt2x00/debian/patches/005_fix_probe_148f_2573.diff
Log:
Use rt2500usb_register_multiread.


Modified: unstable/rt2x00/debian/patches/005_fix_probe_148f_2573.diff
===================================================================
--- unstable/rt2x00/debian/patches/005_fix_probe_148f_2573.diff	2007-10-29 23:57:22 UTC (rev 64)
+++ unstable/rt2x00/debian/patches/005_fix_probe_148f_2573.diff	2007-10-31 23:41:18 UTC (rev 65)
@@ -8,16 +8,15 @@
  	u16 value;
  	u16 eeprom;
  
-@@ -1291,12 +1292,14 @@
+@@ -1291,12 +1292,13 @@
  	 */
  	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);
  	rt2500usb_register_read(rt2x00dev, MAC_CSR0, &reg);
 -	rt2x00_set_chip(rt2x00dev, RT2570, value, reg);
 -
 -	if (rt2x00_rev(&rt2x00dev->chip, 0xffff0)) {
-+	rt2x00usb_vendor_request_buff(rt2x00dev, USB_MULTI_READ,
-+				      USB_VENDOR_REQUEST_IN, MAC_RT73_CSR0,
-+				      &reg32, sizeof(reg32), REGISTER_TIMEOUT);
++	rt2500usb_register_multiread(rt2x00dev, MAC_RT73_CSR0,
++				     &reg32, sizeof(reg32));
 +	if ((reg & 0xfff0) || (le32_to_cpu(reg32) & 0xffff0) == 0x25730) {
  		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
  		return -ENODEV;