diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-23 09:45:13 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-23 09:45:13 -0300 |
| commit | afbe8098d1f0cf8f7e66a817c530318c67e155ee (patch) | |
| tree | 6d9fbb7a8dbba9325f2bb77ddfd27ea5a2d5752c /linux/drivers/media/video/s2255drv.c | |
| parent | 990ddd211286de0b58e67483c758ce029715c97e (diff) | |
| parent | 35fd9350715393e0694b0bdf01394eae7e590e43 (diff) | |
| download | mediapointer-dvb-s2-afbe8098d1f0cf8f7e66a817c530318c67e155ee.tar.gz mediapointer-dvb-s2-afbe8098d1f0cf8f7e66a817c530318c67e155ee.tar.bz2 | |
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/s2255drv.c')
| -rw-r--r-- | linux/drivers/media/video/s2255drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/s2255drv.c b/linux/drivers/media/video/s2255drv.c index c13aa2cc8..0fac6af08 100644 --- a/linux/drivers/media/video/s2255drv.c +++ b/linux/drivers/media/video/s2255drv.c @@ -1238,6 +1238,7 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn, buffer[1] = (u32) chn_rev; buffer[2] = CMD_SET_MODE; memcpy(&buffer[3], &dev->mode[chn], sizeof(struct s2255_mode)); + dev->setmode_ready[chn] = 0; res = s2255_write_config(dev->udev, (unsigned char *)buffer, 512); if (debug) dump_verify_mode(dev, mode); @@ -1246,7 +1247,6 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn, /* wait at least 3 frames before continuing */ if (mode->restart) { - dev->setmode_ready[chn] = 0; wait_event_timeout(dev->wait_setmode[chn], (dev->setmode_ready[chn] != 0), msecs_to_jiffies(S2255_SETMODE_TIMEOUT)); |