Commit c6c14330 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab

[media] gspca - sonixj: Add a flag in the driver_info table

Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4f67f3ad
...@@ -64,6 +64,7 @@ struct sd { ...@@ -64,6 +64,7 @@ struct sd {
u8 jpegqual; /* webcam quality */ u8 jpegqual; /* webcam quality */
u8 reg18; u8 reg18;
u8 flags;
s8 ag_cnt; s8 ag_cnt;
#define AG_CNT_START 13 #define AG_CNT_START 13
...@@ -1763,7 +1764,8 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -1763,7 +1764,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
struct cam *cam; struct cam *cam;
sd->bridge = id->driver_info >> 16; sd->bridge = id->driver_info >> 16;
sd->sensor = id->driver_info; sd->sensor = id->driver_info >> 8;
sd->flags = id->driver_info;
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
if (sd->sensor == SENSOR_ADCM1700) { if (sd->sensor == SENSOR_ADCM1700) {
...@@ -2947,7 +2949,11 @@ static const struct sd_desc sd_desc = { ...@@ -2947,7 +2949,11 @@ static const struct sd_desc sd_desc = {
/* -- module initialisation -- */ /* -- module initialisation -- */
#define BS(bridge, sensor) \ #define BS(bridge, sensor) \
.driver_info = (BRIDGE_ ## bridge << 16) \ .driver_info = (BRIDGE_ ## bridge << 16) \
| SENSOR_ ## sensor | (SENSOR_ ## sensor << 8)
#define BSF(bridge, sensor, flags) \
.driver_info = (BRIDGE_ ## bridge << 16) \
| (SENSOR_ ## sensor << 8) \
| (flags)
static const __devinitdata struct usb_device_id device_table[] = { static const __devinitdata struct usb_device_id device_table[] = {
#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
{USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)}, {USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment