From 008c1e4730b9758af59c2097189b30b88dd8d593 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Sat, 6 May 2006 18:34:10 -0700
Subject: [PATCH] --- yaml --- r: 26552 b: refs/heads/master c:
 0eb1bd210d94e9f2c87551d794bb2755e5e24eed h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/irda/irda-usb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fb0e08e7ce84..ca74991c0249 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b
+refs/heads/master: 0eb1bd210d94e9f2c87551d794bb2755e5e24eed
diff --git a/trunk/drivers/net/irda/irda-usb.c b/trunk/drivers/net/irda/irda-usb.c
index 96bdb73c2283..cd87593e4e8a 100644
--- a/trunk/drivers/net/irda/irda-usb.c
+++ b/trunk/drivers/net/irda/irda-usb.c
@@ -1778,7 +1778,7 @@ static int irda_usb_probe(struct usb_interface *intf,
 
 	if (self->needspatch) {
 		ret = usb_control_msg (self->usbdev, usb_sndctrlpipe (self->usbdev, 0),
-				       0x02, 0x40, 0, 0, 0, 0, msecs_to_jiffies(500));
+				       0x02, 0x40, 0, 0, NULL, 0, 500);
 		if (ret < 0) {
 			IRDA_DEBUG (0, "usb_control_msg failed %d\n", ret);
 			goto err_out_3;