From e0585257fa5659dc5695738fdc61e777a286e409 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Thu, 17 Apr 2008 21:41:23 -0300 Subject: [PATCH] --- yaml --- r: 92687 b: refs/heads/master c: 7640ea99339c687864f6131598e2eee2ca73cb9c h: refs/heads/master i: 92685: 497c2596c8c3db8657616d64612bc7253d0a3f3e 92683: b0c61b006cbde8f7b50be29617bb6d5117eea955 92679: fbd1c49fbcc8474966c3cec06fa04d6461374848 92671: 9942408bff2b7af799a99ce8a1024154ddd419bd v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-core.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9457342b5841..e5ed42295aaa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83244025e70aadd7e8baad520decf5d53d534d8f +refs/heads/master: 7640ea99339c687864f6131598e2eee2ca73cb9c diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c index a742a57d3979..9cbc4788090c 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-core.c +++ b/trunk/drivers/media/video/em28xx/em28xx-core.c @@ -153,7 +153,6 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf, ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), req, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 0x0000, reg, bufs, len, HZ); - msleep(5); /* FIXME: magic number */ kfree(bufs); return ret; }