diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2010-12-14 14:15:00 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-17 15:48:18 -0500 |
commit | 4f67f3adefadbb056c1ce2c228916701b566e6fc (patch) | |
tree | e536895f2f539fe7996c68dce91241da139c91ec /drivers | |
parent | 5e68f400aad4e2c29e2531cc4413c459fa88cb62 (diff) |
[media] gspca - sonixj: Fix a bad probe exchange
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/gspca/sonixj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index 5d5698959b10..6f3ec2e92391 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -1794,7 +1794,7 @@ static int sd_init(struct gspca_dev *gspca_dev) | |||
1794 | /* setup a selector by bridge */ | 1794 | /* setup a selector by bridge */ |
1795 | reg_w1(gspca_dev, 0xf1, 0x01); | 1795 | reg_w1(gspca_dev, 0xf1, 0x01); |
1796 | reg_r(gspca_dev, 0x00, 1); | 1796 | reg_r(gspca_dev, 0x00, 1); |
1797 | reg_w1(gspca_dev, 0xf1, gspca_dev->usb_buf[0]); | 1797 | reg_w1(gspca_dev, 0xf1, 0x00); |
1798 | reg_r(gspca_dev, 0x00, 1); /* get sonix chip id */ | 1798 | reg_r(gspca_dev, 0x00, 1); /* get sonix chip id */ |
1799 | regF1 = gspca_dev->usb_buf[0]; | 1799 | regF1 = gspca_dev->usb_buf[0]; |
1800 | if (gspca_dev->usb_err < 0) | 1800 | if (gspca_dev->usb_err < 0) |
@@ -2289,10 +2289,10 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
2289 | struct sd *sd = (struct sd *) gspca_dev; | 2289 | struct sd *sd = (struct sd *) gspca_dev; |
2290 | int i; | 2290 | int i; |
2291 | u8 reg0102[2]; | 2291 | u8 reg0102[2]; |
2292 | const u8 *reg9a; | ||
2293 | u8 reg1, reg17; | 2292 | u8 reg1, reg17; |
2294 | const u8 *sn9c1xx; | 2293 | const u8 *sn9c1xx; |
2295 | const u8 (*init)[8]; | 2294 | const u8 (*init)[8]; |
2295 | const u8 *reg9a; | ||
2296 | int mode; | 2296 | int mode; |
2297 | static const u8 reg9a_def[] = | 2297 | static const u8 reg9a_def[] = |
2298 | {0x00, 0x40, 0x20, 0x00, 0x00, 0x00}; | 2298 | {0x00, 0x40, 0x20, 0x00, 0x00, 0x00}; |