Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[firefly-linux-kernel-4.4.55.git] / drivers / staging / cx25821 / cx25821-video.c

diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
index ab05392386e86e2f19b9214c94d57532759bcca7..7a0304a857358557a869b23e279ee7d48c06220c 100644 (file)
--- a/drivers/staging/cx25821/cx25821-video.c
+++ b/drivers/staging/cx25821/cx25821-video.c
@@ -832,6 +832,7 @@ static int video_open(struct file *file)
 
        if (NULL == dev) {
                mutex_unlock(&cx25821_devlist_mutex);
+               kfree(fh);
                return -ENODEV;
        }
 
@@ -1573,7 +1574,7 @@ int cx25821_set_control(struct cx25821_dev *dev,
                break;
        default:
                /* nothing */ ;
-       };
+       }
 
        switch (ctl->id) {
        case V4L2_CID_BRIGHTNESS: