From f39bace3b3bf05be4ea905fdc5d2effab848e0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= Date: Thu, 11 Nov 2010 06:20:42 -0300 Subject: [PATCH] --- yaml --- r: 226228 b: refs/heads/master c: d65174c06f2bf4ff73d1c71960be317b89561c06 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/ov519.c | 2 ++ trunk/drivers/media/video/gspca/w996Xcf.c | 6 ++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a3f035238095..be51f63043a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14653e64e9db48e91cbd00fba335a6a459e66cc9 +refs/heads/master: d65174c06f2bf4ff73d1c71960be317b89561c06 diff --git a/trunk/drivers/media/video/gspca/ov519.c b/trunk/drivers/media/video/gspca/ov519.c index 7e86faf12f5b..ed70229b0276 100644 --- a/trunk/drivers/media/video/gspca/ov519.c +++ b/trunk/drivers/media/video/gspca/ov519.c @@ -3937,6 +3937,8 @@ static void sd_stop0(struct gspca_dev *gspca_dev) { struct sd *sd = (struct sd *) gspca_dev; + if (!sd->gspca_dev.present) + return; if (sd->bridge == BRIDGE_W9968CF) w9968cf_stop0(sd); diff --git a/trunk/drivers/media/video/gspca/w996Xcf.c b/trunk/drivers/media/video/gspca/w996Xcf.c index 4066ac8c45a0..b5a93e379570 100644 --- a/trunk/drivers/media/video/gspca/w996Xcf.c +++ b/trunk/drivers/media/video/gspca/w996Xcf.c @@ -549,10 +549,8 @@ static int w9968cf_mode_init_regs(struct sd *sd) static void w9968cf_stop0(struct sd *sd) { - if (sd->gspca_dev.present) { - reg_w(sd, 0x39, 0x0000); /* disable JPEG encoder */ - reg_w(sd, 0x16, 0x0000); /* stop video capture */ - } + reg_w(sd, 0x39, 0x0000); /* disable JPEG encoder */ + reg_w(sd, 0x16, 0x0000); /* stop video capture */ } /* The w9968cf docs say that a 0 sized packet means EOF (and also SOF