diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 10:33:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 10:33:10 +1000 |
| commit | 3de8c6b335292671a9a5fd048ceb17d7b24c1202 (patch) | |
| tree | 0fd1641b8a37f96380bcef40aa7248e382731fa6 /drivers/media/video/gspca/stv06xx/stv06xx.c | |
| parent | c35c44fe975c8acbc6ba82f12dad85549f881950 (diff) | |
| parent | 218fec7eef0f3fe5dccdea760bfbd3fd339c5a15 (diff) | |
Merge commit 'v4l-dvb/master'
Conflicts:
drivers/media/video/gspca/Kconfig
drivers/media/video/sh_mobile_ceu_camera.c
Diffstat (limited to 'drivers/media/video/gspca/stv06xx/stv06xx.c')
| -rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c index 0da8e0de0456..7af511b5e9c2 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx.c +++ b/drivers/media/video/gspca/stv06xx/stv06xx.c @@ -130,8 +130,8 @@ int stv06xx_write_sensor_bytes(struct sd *sd, const u8 *data, u8 len) STV06XX_URB_MSG_TIMEOUT); if (err < 0) return err; - } - return stv06xx_write_sensor_finish(sd); + } + return stv06xx_write_sensor_finish(sd); } int stv06xx_write_sensor_words(struct sd *sd, const u16 *data, u8 len) |