diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 16:48:52 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 16:48:52 +0200 |
| commit | 7d63b54a65ce902f9aaa8efe8192aa3b983264d4 (patch) | |
| tree | 250a77bebe92cbd6edac70a649866044295876db /drivers/net/irda/irda-usb.c | |
| parent | [GFS2] Readpages support (diff) | |
| parent | Linux v2.6.17-rc4 (diff) | |
| download | linux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.tar.xz linux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/irda/irda-usb.c')
| -rw-r--r-- | drivers/net/irda/irda-usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c index 96bdb73c2283..cd87593e4e8a 100644 --- a/drivers/net/irda/irda-usb.c +++ b/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; |