From b755d3866aba5602e739892424cdbf615f3eabf1 Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Thu, 8 Nov 2012 14:11:38 -0300 Subject: [PATCH] --- yaml --- r: 357127 b: refs/heads/master c: 89f84b9c2057fbfc85796d29d53d5b8e01002315 h: refs/heads/master i: 357125: b3d1641b24b1f7501df60bdc32c8fdb47cf06442 357123: 44a64a9896e459e25bbbf6bac944d162476a5661 357119: 23e2d649f91f01abe529d95a4be4b59538873c05 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/em28xx/em28xx.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a99c792c6ee2..83ed882de592 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74209dc06a7c27401de637cc371f54920d628ba8 +refs/heads/master: 89f84b9c2057fbfc85796d29d53d5b8e01002315 diff --git a/trunk/drivers/media/usb/em28xx/em28xx.h b/trunk/drivers/media/usb/em28xx/em28xx.h index 17310e6a51e2..6773ca8d3647 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx.h +++ b/trunk/drivers/media/usb/em28xx/em28xx.h @@ -187,10 +187,6 @@ Interval: 125us */ -/* time to wait when stopping the isoc transfer */ -#define EM28XX_URB_TIMEOUT \ - msecs_to_jiffies(EM28XX_NUM_BUFS * EM28XX_NUM_PACKETS) - /* time in msecs to wait for i2c writes to finish */ #define EM2800_I2C_WRITE_TIMEOUT 20