summaryrefslogtreecommitdiffstats
path: root/drivers/net/irda
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-05-07 03:34:10 +0200
committerDavid S. Miller <davem@davemloft.net>2006-05-07 03:34:10 +0200
commit0eb1bd210d94e9f2c87551d794bb2755e5e24eed (patch)
tree710c9b897f46c07b855aaa51611ad2e7f9a74908 /drivers/net/irda
parent[IPV4]: Remove likely in ip_rcv_finish() (diff)
downloadlinux-0eb1bd210d94e9f2c87551d794bb2755e5e24eed.tar.xz
linux-0eb1bd210d94e9f2c87551d794bb2755e5e24eed.zip
[IRDA] irda-usb: use NULL instead of 0
Use NULL instead of 0 for a null pointer value (sparse warning): drivers/net/irda/irda-usb.c:1781:30: warning: Using plain integer as NULL pointer Also, correct timeout argument to use milliseconds instead of jiffies. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r--drivers/net/irda/irda-usb.c2
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;