Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on a .30-rc1 base and was missing out on
              on a handful of tracing fixes present in .30-rc5-almost.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 5202cadb2aae..30f4698be90a 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -1237,6 +1237,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);
@@ -1245,7 +1246,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));