From ae676dc6f2fe9ef22c9fbdca3897f17ac0fcc709 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 4 Jul 2011 11:11:41 -0300 Subject: [PATCH] --- yaml --- r: 261541 b: refs/heads/master c: ef60e8f5d58752879cc69d9746133f2416ac206a h: refs/heads/master i: 261539: 53167ebe7164cb5a28d4154a054992ea7040ffd8 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx231xx/cx231xx-cards.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f5ef7940873b..7c2094c7236c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee893e9adccd7dc22a6cfc5d4f49e7dd0baead0c +refs/heads/master: ef60e8f5d58752879cc69d9746133f2416ac206a diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c index 4b22afee18cf..9a07d3df3e20 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c @@ -1125,6 +1125,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface, if (assoc_desc->bFirstInterface != ifnum) { cx231xx_err(DRIVER_NAME ": Not found " "matching IAD interface\n"); + cx231xx_devused &= ~(1 << nr); + kfree(dev); + dev = NULL; return -ENODEV; }