3 files changed, 2 insertions, 6 deletions

diff --git a/drivers/media/video/cx231xx/cx231xx-417.c b/drivers/media/video/cx231xx/cx231xx-417.c
index f8f0e59cd583..d4327dab5a36 100644
--- a/drivers/media/video/cx231xx/cx231xx-417.c
+++ b/drivers/media/video/cx231xx/cx231xx-417.c
@@ -1686,7 +1686,6 @@ static struct v4l2_capability pvr_capability = {
         .capabilities   = (V4L2_CAP_VIDEO_CAPTURE |
                            V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_RADIO |
                          V4L2_CAP_STREAMING | V4L2_CAP_READWRITE),
-        .reserved       = {0, 0, 0, 0}
 };
 static int vidioc_querycap(struct file *file, void  *priv,
                                 struct v4l2_capability *cap)
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index 875a7ce94736..8ed460d692e0 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/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/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 829a41b0c9ef..7f916f0685e9 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/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;
                 }