Skip to content

Commit

Permalink
[media] gspca - sonixj: Add a flag in the driver_info table
Browse files Browse the repository at this point in the history
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Jean-Francois Moine authored and Mauro Carvalho Chehab committed Dec 17, 2010
1 parent 4f67f3a commit c6c1433
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/media/video/gspca/sonixj.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ struct sd {
u8 jpegqual; /* webcam quality */

u8 reg18;
u8 flags;

s8 ag_cnt;
#define AG_CNT_START 13
Expand Down Expand Up @@ -1763,7 +1764,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
struct cam *cam;

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;
if (sd->sensor == SENSOR_ADCM1700) {
Expand Down Expand Up @@ -2947,7 +2949,11 @@ static const struct sd_desc sd_desc = {
/* -- module initialisation -- */
#define BS(bridge, sensor) \
.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[] = {
#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
{USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},
Expand Down

0 comments on commit c6c1433

Please sign in to comment.