Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 226239
b: refs/heads/master
c: a23acec
h: refs/heads/master
i:
  226237: 88a7171
  226235: 65b4348
  226231: 8d03db1
  226223: 06e91df
  226207: 34c0dae
  226175: 230df9c
v: v3
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Dec 29, 2010
1 parent de185f5 commit 35a8a1a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e2817029b3f139bd85360536153467bd8f7f863b
refs/heads/master: a23acec4bca79f2168a5aeacc8d85386b70ae522
8 changes: 4 additions & 4 deletions trunk/drivers/media/video/gspca/ov519.c
Original file line number Diff line number Diff line change
Expand Up @@ -2639,14 +2639,14 @@ static void ov51x_led_control(struct sd *sd, int on)
switch (sd->bridge) {
/* OV511 has no LED control */
case BRIDGE_OV511PLUS:
reg_w(sd, R511_SYS_LED_CTL, on ? 1 : 0);
reg_w(sd, R511_SYS_LED_CTL, on);
break;
case BRIDGE_OV518:
case BRIDGE_OV518PLUS:
reg_w_mask(sd, R518_GPIO_OUT, on ? 0x02 : 0x00, 0x02);
reg_w_mask(sd, R518_GPIO_OUT, 0x02 * on, 0x02);
break;
case BRIDGE_OV519:
reg_w_mask(sd, OV519_GPIO_DATA_OUT0, !on, 1); /* 0 / 1 */
reg_w_mask(sd, OV519_GPIO_DATA_OUT0, on, 1);
break;
}
}
Expand Down Expand Up @@ -2938,7 +2938,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
struct cam *cam = &gspca_dev->cam;

sd->bridge = id->driver_info & BRIDGE_MASK;
sd->invert_led = id->driver_info & BRIDGE_INVERT_LED;
sd->invert_led = (id->driver_info & BRIDGE_INVERT_LED) != 0;

switch (sd->bridge) {
case BRIDGE_OV511:
Expand Down

0 comments on commit 35a8a1a

Please sign in to comment.