From 24429b363b6d52f4298c43c17c77015a19d9288d Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 4 Mar 2012 16:25:04 -0300 Subject: [PATCH] --- yaml --- r: 295063 b: refs/heads/master c: 266e8ae37daa04fb3d89759305659f4e0acbc126 h: refs/heads/master i: 295061: 5e26a2f1885227acc869bf59fec548b314c26e13 295059: 08db415eaa1c9cb9ad24ac0f37b353b1fa396803 295055: fe53f534a0b1fdd0977e7b7a8674fffd9307b1fa v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx231xx/cx231xx-cards.c | 1 - trunk/drivers/media/video/cx231xx/cx231xx-video.c | 6 ++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 30b401052735..e49299e6c49c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a611d8cd078e0059a4a596bcbed0bd8a915e2ef +refs/heads/master: 266e8ae37daa04fb3d89759305659f4e0acbc126 diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c index 875a7ce94736..8ed460d692e0 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c @@ -861,7 +861,6 @@ void cx231xx_release_resources(struct cx231xx *dev) kfree(dev->sliced_cc_mode.alt_max_pkt_size); kfree(dev->ts1_mode.alt_max_pkt_size); kfree(dev); - dev = NULL; } /* diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-video.c b/trunk/drivers/media/video/cx231xx/cx231xx-video.c index 829a41b0c9ef..7f916f0685e9 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-video.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-video.c @@ -2319,8 +2319,7 @@ static int cx231xx_v4l2_close(struct file *filp) if (dev->state & DEV_DISCONNECTED) { if (atomic_read(&dev->devlist_count) > 0) { cx231xx_release_resources(dev); - kfree(dev); - dev = NULL; + fh->dev = NULL; return 0; } return 0; @@ -2350,8 +2349,7 @@ static int cx231xx_v4l2_close(struct file *filp) free the remaining resources */ if (dev->state & DEV_DISCONNECTED) { cx231xx_release_resources(dev); - kfree(dev); - dev = NULL; + fh->dev = NULL; return 0; }