From 35a8a1a03ce2ab5250d915480a50f1846739165c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= Date: Fri, 12 Nov 2010 15:07:35 -0300 Subject: [PATCH] --- yaml --- r: 226239 b: refs/heads/master c: a23acec4bca79f2168a5aeacc8d85386b70ae522 h: refs/heads/master i: 226237: 88a71717eb18dad5b2f6bb7412ccea59216a262a 226235: 65b4348f6839c88b528bdcf9269c0e1c29dbbd4e 226231: 8d03db164399ce5c79b2a1ab5476db80f433a947 226223: 06e91dfa8f73cdb420012a2125bb42b2ddbcd6e6 226207: 34c0dae9a4e9a1d4088406cfb9482ffe8759f369 226175: 230df9ca6e0a01c76092bb531100455581c0c9c2 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/ov519.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ee6e6030fbe6..9b4b11fb9198 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2817029b3f139bd85360536153467bd8f7f863b +refs/heads/master: a23acec4bca79f2168a5aeacc8d85386b70ae522 diff --git a/trunk/drivers/media/video/gspca/ov519.c b/trunk/drivers/media/video/gspca/ov519.c index d60322047265..2484e5222d4a 100644 --- a/trunk/drivers/media/video/gspca/ov519.c +++ b/trunk/drivers/media/video/gspca/ov519.c @@ -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; } } @@ -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: