diff options
author | Nicola Soranzo <nsoranzo@tiscali.it> | 2009-02-10 21:28:24 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:45 -0400 |
commit | a1a6ee74f2c68918f2e145dccba3637eea91a52a (patch) | |
tree | bd30e007e8903b469c785bf531527986faa6fa66 /drivers/media/video/em28xx/em28xx.h | |
parent | 7aa0eabde08259c47586df934921c67cff36e7dc (diff) |
V4L/DVB (10525): em28xx: Coding style fixes and a typo correction
Lots of coding style fixes and a typo correction for em28xx.
[dougsland@redhat.com: fixed a reject due to a change on em28xx-audio.c]
Signed-off-by: Nicola Soranzo <nsoranzo@tiscali.it>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 6844b98e1b67..5115db3a76a6 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -161,7 +161,8 @@ | |||
161 | */ | 161 | */ |
162 | 162 | ||
163 | /* time to wait when stopping the isoc transfer */ | 163 | /* time to wait when stopping the isoc transfer */ |
164 | #define EM28XX_URB_TIMEOUT msecs_to_jiffies(EM28XX_NUM_BUFS * EM28XX_NUM_PACKETS) | 164 | #define EM28XX_URB_TIMEOUT \ |
165 | msecs_to_jiffies(EM28XX_NUM_BUFS * EM28XX_NUM_PACKETS) | ||
165 | 166 | ||
166 | /* time in msecs to wait for i2c writes to finish */ | 167 | /* time in msecs to wait for i2c writes to finish */ |
167 | #define EM2800_I2C_WRITE_TIMEOUT 20 | 168 | #define EM2800_I2C_WRITE_TIMEOUT 20 |
@@ -530,7 +531,8 @@ struct em28xx { | |||
530 | int num_alt; /* Number of alternative settings */ | 531 | int num_alt; /* Number of alternative settings */ |
531 | unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */ | 532 | unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */ |
532 | struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */ | 533 | struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */ |
533 | char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */ | 534 | char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc |
535 | transfer */ | ||
534 | char urb_buf[URB_MAX_CTRL_SIZE]; /* urb control msg buffer */ | 536 | char urb_buf[URB_MAX_CTRL_SIZE]; /* urb control msg buffer */ |
535 | 537 | ||
536 | /* helper funcs that call usb_control_msg */ | 538 | /* helper funcs that call usb_control_msg */ |