aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sonixj.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2010-12-14 14:15:37 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-17 15:48:30 -0500
commitc6c14330717f9850b4b4c054b81424b9979cd07d (patch)
tree1a2ed2d839fb0f4d7f6016e7a351a2056d2a68e7 /drivers/media/video/gspca/sonixj.c
parent4f67f3adefadbb056c1ce2c228916701b566e6fc (diff)
[media] gspca - sonixj: Add a flag in the driver_info table
Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/sonixj.c')
-rw-r--r--drivers/media/video/gspca/sonixj.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 6f3ec2e92391..1b9157347763 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -64,6 +64,7 @@ struct sd {
64 u8 jpegqual; /* webcam quality */ 64 u8 jpegqual; /* webcam quality */
65 65
66 u8 reg18; 66 u8 reg18;
67 u8 flags;
67 68
68 s8 ag_cnt; 69 s8 ag_cnt;
69#define AG_CNT_START 13 70#define AG_CNT_START 13
@@ -1763,7 +1764,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
1763 struct cam *cam; 1764 struct cam *cam;
1764 1765
1765 sd->bridge = id->driver_info >> 16; 1766 sd->bridge = id->driver_info >> 16;
1766 sd->sensor = id->driver_info; 1767 sd->sensor = id->driver_info >> 8;
1768 sd->flags = id->driver_info;
1767 1769
1768 cam = &gspca_dev->cam; 1770 cam = &gspca_dev->cam;
1769 if (sd->sensor == SENSOR_ADCM1700) { 1771 if (sd->sensor == SENSOR_ADCM1700) {
@@ -2947,7 +2949,11 @@ static const struct sd_desc sd_desc = {
2947/* -- module initialisation -- */ 2949/* -- module initialisation -- */
2948#define BS(bridge, sensor) \ 2950#define BS(bridge, sensor) \
2949 .driver_info = (BRIDGE_ ## bridge << 16) \ 2951 .driver_info = (BRIDGE_ ## bridge << 16) \
2950 | SENSOR_ ## sensor 2952 | (SENSOR_ ## sensor << 8)
2953#define BSF(bridge, sensor, flags) \
2954 .driver_info = (BRIDGE_ ## bridge << 16) \
2955 | (SENSOR_ ## sensor << 8) \
2956 | (flags)
2951static const __devinitdata struct usb_device_id device_table[] = { 2957static const __devinitdata struct usb_device_id device_table[] = {
2952#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE 2958#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
2953 {USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)}, 2959 {USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},