aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sonixb.c
diff options
context:
space:
mode:
authorHans de Goede <j.w.r.degoede@hhs.nl>2008-09-03 16:12:19 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-03 17:37:43 -0400
commit271315a9b4363ed884024022f2cf799344548e8f (patch)
treebc444f5412d0c9093c2a767a29542bfb042cd4c5 /drivers/media/video/gspca/sonixb.c
parent8295d99ee5340f1e62b53c8adc979e0789299445 (diff)
V4L/DVB (8830): gspca: Move some probe code to the new init function.
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/sonixb.c')
-rw-r--r--drivers/media/video/gspca/sonixb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 162beb3feadb..602608031247 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -736,7 +736,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
736 struct sd *sd = (struct sd *) gspca_dev; 736 struct sd *sd = (struct sd *) gspca_dev;
737 struct cam *cam; 737 struct cam *cam;
738 int sif = 0; 738 int sif = 0;
739 const __u8 stop = 0x09; /* Disable stream turn of LED */
740 739
741 reg_r(gspca_dev, 0x00); 740 reg_r(gspca_dev, 0x00);
742 if (gspca_dev->usb_buf[0] != 0x10) 741 if (gspca_dev->usb_buf[0] != 0x10)
@@ -773,15 +772,16 @@ static int sd_config(struct gspca_dev *gspca_dev,
773 sd->autogain = AUTOGAIN_DEF; 772 sd->autogain = AUTOGAIN_DEF;
774 sd->freq = FREQ_DEF; 773 sd->freq = FREQ_DEF;
775 774
776 /* Disable stream turn of LED */
777 reg_w(gspca_dev, 0x01, &stop, 1);
778
779 return 0; 775 return 0;
780} 776}
781 777
782/* this function is called at probe and resume time */ 778/* this function is called at probe and resume time */
783static int sd_init(struct gspca_dev *gspca_dev) 779static int sd_init(struct gspca_dev *gspca_dev)
784{ 780{
781 const __u8 stop = 0x09; /* Disable stream turn of LED */
782
783 reg_w(gspca_dev, 0x01, &stop, 1);
784
785 return 0; 785 return 0;
786} 786}
787 787