diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-11-11 04:20:42 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:16:40 -0500 |
commit | d65174c06f2bf4ff73d1c71960be317b89561c06 (patch) | |
tree | 1af417af6221dfaaca05fad7ae59cf55bc8e3583 /drivers | |
parent | 14653e64e9db48e91cbd00fba335a6a459e66cc9 (diff) |
[media] gspca - ov519: Don't do USB exchanges after disconnection
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/gspca/ov519.c | 2 | ||||
-rw-r--r-- | drivers/media/video/gspca/w996Xcf.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c index 7e86faf12f5b..ed70229b0276 100644 --- a/drivers/media/video/gspca/ov519.c +++ b/drivers/media/video/gspca/ov519.c | |||
@@ -3937,6 +3937,8 @@ static void sd_stop0(struct gspca_dev *gspca_dev) | |||
3937 | { | 3937 | { |
3938 | struct sd *sd = (struct sd *) gspca_dev; | 3938 | struct sd *sd = (struct sd *) gspca_dev; |
3939 | 3939 | ||
3940 | if (!sd->gspca_dev.present) | ||
3941 | return; | ||
3940 | if (sd->bridge == BRIDGE_W9968CF) | 3942 | if (sd->bridge == BRIDGE_W9968CF) |
3941 | w9968cf_stop0(sd); | 3943 | w9968cf_stop0(sd); |
3942 | 3944 | ||
diff --git a/drivers/media/video/gspca/w996Xcf.c b/drivers/media/video/gspca/w996Xcf.c index 4066ac8c45a0..b5a93e379570 100644 --- a/drivers/media/video/gspca/w996Xcf.c +++ b/drivers/media/video/gspca/w996Xcf.c | |||
@@ -549,10 +549,8 @@ static int w9968cf_mode_init_regs(struct sd *sd) | |||
549 | 549 | ||
550 | static void w9968cf_stop0(struct sd *sd) | 550 | static void w9968cf_stop0(struct sd *sd) |
551 | { | 551 | { |
552 | if (sd->gspca_dev.present) { | 552 | reg_w(sd, 0x39, 0x0000); /* disable JPEG encoder */ |
553 | reg_w(sd, 0x39, 0x0000); /* disable JPEG encoder */ | 553 | reg_w(sd, 0x16, 0x0000); /* stop video capture */ |
554 | reg_w(sd, 0x16, 0x0000); /* stop video capture */ | ||
555 | } | ||
556 | } | 554 | } |
557 | 555 | ||
558 | /* The w9968cf docs say that a 0 sized packet means EOF (and also SOF | 556 | /* The w9968cf docs say that a 0 sized packet means EOF (and also SOF |