speedtch cxacru.c,1.34,1.35

[Duncan Sands]

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

Modified Files:
	cxacru.c 
Log Message:
Remove URB_ASYNC_UNLINK, since it has been eliminated from the latest kernels.
Unfortunately this loses backwards compatibility: this module won't work
correctly with older kernels since they will think unlinks are supposed to be
synchronous.  Remove some trailing whitespace while there.


Index: cxacru.c
===================================================================
RCS file: /home/cvs/speedtch/cxacru.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cxacru.c	9 Sep 2005 13:41:31 -0000	1.34
+++ cxacru.c	12 Sep 2005 13:00:50 -0000	1.35
@@ -156,7 +156,7 @@
 
 	const struct cxacru_modem_type *modem_type;
 
-	int line_status; 
+	int line_status;
 	struct work_struct poll_work;
 
 	/* contol handles */
@@ -182,7 +182,7 @@
 
 static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
 				 int* actual_length)
-{ 
+{
 	struct timer_list timer;
 	int status;
 
@@ -282,7 +282,7 @@
 		if (offd >= rsize)
 			break;
 		memcpy(rdata + offd, rbuf + offb + 4, min_t(int, stride, rsize - offd));
-		offd += stride; 
+		offd += stride;
 	}
 
 	ret = offd;
@@ -304,7 +304,7 @@
 	buf = kmalloc(buflen, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
-	
+
 	ret = cxacru_cm(instance, cm, NULL, 0, (u8 *) buf, buflen);
 	if (ret < 0)
 		goto cleanup;
@@ -360,7 +360,7 @@
 	dbg("cxacru_atm_start");
 
 	/* Read MAC address */
-	ret = cxacru_cm(instance, CM_REQUEST_CARD_GET_MAC_ADDRESS, NULL, 0, 
+	ret = cxacru_cm(instance, CM_REQUEST_CARD_GET_MAC_ADDRESS, NULL, 0,
 			atm_dev->esi, sizeof(atm_dev->esi));
 	if (ret < 0) {
 		atm_err(usbatm_instance, "cxacru_atm_start: CARD_GET_MAC_ADDRESS returned %d\n", ret);
@@ -460,7 +460,7 @@
 	buf = (u8 *) __get_free_page(GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
-	
+
 	offb = offd = 0;
 	do {
 		int l = min_t(int, stride, size - offd);
@@ -488,7 +488,7 @@
 		}
 	} while(offd < size);
 	dbg("sent fw %#x", fw);
-	
+
 	ret = 0;
 
 cleanup:
@@ -582,7 +582,7 @@
 		usb_err(usbatm, "modem failed to initialize: %d\n", ret);
 		return;
 	}
-	
+
 	/* Load config data (le32), doing one packet at a time */
 	if (cf)
 		for (off = 0; off < cf->size / 4; ) {
@@ -714,13 +714,11 @@
 			usb_dev, usb_rcvintpipe(usb_dev, CXACRU_EP_CMD),
 			instance->rcv_buf, PAGE_SIZE,
 			cxacru_blocking_completion, &instance->rcv_done, 1);
-	instance->rcv_urb->transfer_flags |= URB_ASYNC_UNLINK;
 
 	usb_fill_int_urb(instance->snd_urb,
 			usb_dev, usb_sndintpipe(usb_dev, CXACRU_EP_CMD),
 			instance->snd_buf, PAGE_SIZE,
 			cxacru_blocking_completion, &instance->snd_done, 4);
-	instance->snd_urb->transfer_flags |= URB_ASYNC_UNLINK;
 
 	init_MUTEX(&instance->cm_serialize);