summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca/vc032x.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-17 10:25:38 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-17 10:25:38 -0300
commit216737d4199ef875a6a09256d760d09b4442f75a (patch)
tree1dd433536fafd7de5f7e59cbed1b654e1f35d997 /linux/drivers/media/video/gspca/vc032x.c
parent8cc9d58b365e60e2b3b97cbc052b8bcb70219c0e (diff)
parentc4389d67725ce2dfd9da31a05f7b33033689b37e (diff)
downloadmediapointer-dvb-s2-216737d4199ef875a6a09256d760d09b4442f75a.tar.gz
mediapointer-dvb-s2-216737d4199ef875a6a09256d760d09b4442f75a.tar.bz2
merge: http://linuxtv.org/hg/~anttip/anysee/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/vc032x.c')
-rw-r--r--linux/drivers/media/video/gspca/vc032x.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/vc032x.c b/linux/drivers/media/video/gspca/vc032x.c
index 9464454f1..148d28802 100644
--- a/linux/drivers/media/video/gspca/vc032x.c
+++ b/linux/drivers/media/video/gspca/vc032x.c
@@ -3419,7 +3419,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
reg_w(gspca_dev->dev, 0x89, 0x058c, 0x0000);
break;
default:
- reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
+ if (!(sd->flags & FL_SAMSUNG))
+ reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
break;
}
msleep(100);
@@ -3437,7 +3438,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
if (sd->sensor == SENSOR_MI1310_SOC)
reg_w(dev, 0x89, 0x058c, 0x00ff);
- else
+ else if (!(sd->flags & FL_SAMSUNG))
reg_w(dev, 0x89, 0xffff, 0xffff);
reg_w(dev, 0xa0, 0x01, 0xb301);
reg_w(dev, 0xa0, 0x09, 0xb003);
@@ -3454,7 +3455,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
/*fixme: is this useful?*/
if (sd->sensor == SENSOR_MI1310_SOC)
reg_w(dev, 0x89, 0x058c, 0x00ff);
- else
+ else if (!(sd->flags & FL_SAMSUNG))
reg_w(dev, 0x89, 0xffff, 0xffff);
}