speedtch xusbatm.c,1.16,1.17

[Duncan Sands]

Update of /home/cvs/speedtch
In directory phoenix.infradead.org:/tmp/cvs-serv22240

Modified Files:
	xusbatm.c 
Log Message:
Fix some thinkos, output more debug info.


Index: xusbatm.c
===================================================================
RCS file: /home/cvs/speedtch/xusbatm.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xusbatm.c	18 Nov 2005 14:08:26 -0000	1.16
+++ xusbatm.c	18 Nov 2005 17:06:46 -0000	1.17
@@ -70,7 +70,7 @@
 	int ifnum = intf->altsetting->desc.bInterfaceNumber;
 	int ret;
 
-	if (claim && !(ret = usb_driver_claim_interface(&xusbatm_usb_driver, intf, usbatm))) {
+	if (claim && (ret = usb_driver_claim_interface(&xusbatm_usb_driver, intf, usbatm))) {
 		usb_err(usbatm, "%s: failed to claim interface %d (%d)!\n", __func__, ifnum, ret);
 		return ret;
 	}
@@ -123,6 +123,10 @@
 		return -EINVAL;
 	}
 
+	usb_dbg(usbatm, "%s: interfaces: rx %d; tx %d\n", __func__,
+			rx_intf->altsetting->desc.bInterfaceNumber,
+			tx_intf->altsetting->desc.bInterfaceNumber);
+
 	if (!(ret = xusbatm_capture_intf(usbatm, usb_dev, rx_intf, rx_alt, rx_intf != intf)))
 		return ret;
 
@@ -194,18 +198,20 @@
 	}
 
 	for (i = 0; i < num_vendor; i++) {
+		rx_endpoint[i] &= USB_ENDPOINT_NUMBER_MASK;
+		tx_endpoint[i] &= USB_ENDPOINT_NUMBER_MASK;
+
 		xusbatm_usb_ids[i].match_flags	= USB_DEVICE_ID_MATCH_DEVICE;
 		xusbatm_usb_ids[i].idVendor	= vendor[i];
 		xusbatm_usb_ids[i].idProduct	= product[i];
 
-
 		xusbatm_drivers[i].owner	= THIS_MODULE;
 		xusbatm_drivers[i].driver_name	= xusbatm_driver_name;
 		xusbatm_drivers[i].bind		= xusbatm_bind;
 		xusbatm_drivers[i].unbind	= xusbatm_unbind;
 		xusbatm_drivers[i].atm_start	= xusbatm_atm_start;
-		xusbatm_drivers[i].bulk_in	= rx_endpoint[i] & USB_ENDPOINT_NUMBER_MASK;
-		xusbatm_drivers[i].bulk_out	= tx_endpoint[i] & USB_ENDPOINT_NUMBER_MASK;
+		xusbatm_drivers[i].bulk_in	= rx_endpoint[i];
+		xusbatm_drivers[i].bulk_out	= tx_endpoint[i];
 		xusbatm_drivers[i].rx_padding	= rx_padding[i];
 		xusbatm_drivers[i].tx_padding	= tx_padding[i];
 	}