summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-11-06 03:31:51 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-11-06 03:31:51 +0000
commitecc31faccec6317e9e11ae5bc1c80cceefc6c7cc (patch)
tree423b3f6c3eb8caa4be58b15857dd141211ba58e2
parent1e7b8dee73f36d53303c453994cf6f4a9fde738b (diff)
downloadmediapointer-dvb-s2-ecc31faccec6317e9e11ae5bc1c80cceefc6c7cc.tar.gz
mediapointer-dvb-s2-ecc31faccec6317e9e11ae5bc1c80cceefc6c7cc.tar.bz2
- Adds missing msp34xxg_reset to VIDIOC_S_STD (just like VIDIOCSCHAN).
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-rw-r--r--linux/drivers/media/video/msp3400-driver.c3
-rw-r--r--linux/drivers/media/video/msp3400.c3
-rw-r--r--v4l/ChangeLog9
3 files changed, 15 insertions, 0 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 60afdac9a..89306bb97 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -2070,6 +2070,9 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
msp->norm=VIDEO_MODE_NTSC;
}
+ if (IS_MSP34XX_G(msp))
+ msp34xxg_reset(client);
+
msp_wake_thread(client);
return 0;
}
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 60afdac9a..89306bb97 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -2070,6 +2070,9 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
msp->norm=VIDEO_MODE_NTSC;
}
+ if (IS_MSP34XX_G(msp))
+ msp34xxg_reset(client);
+
msp_wake_thread(client);
return 0;
}
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 57dc283d8..9ea210a64 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-06 03:24 mchehab
+
+ * ../linux/drivers/media/video/msp3400.c: (msp_command):
+
+ - Adds missing msp34xxg_reset to VIDIOC_S_STD (just like VIDIOCSCHAN).
+
+ Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-11-05 23:20 mchehab
* ../linux/drivers/media/video/msp3400.c: (msp3400c_set_scart),