aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShuah Khan <shuahkh@osg.samsung.com>2016-01-27 21:49:33 -0200
committerBen Hutchings <ben@decadent.org.uk>2020-04-28 19:03:48 +0100
commitf533f163275873aa1f0b247db0fdc5cd452c5fa2 (patch)
treecf28a6b8cf38146f5cd3d09390ca7fd2213d1166
parent2b9fba4061be83f88a3c3f98a201c7a4a0c5fbd7 (diff)
downloadlinux-stable-f533f163275873aa1f0b247db0fdc5cd452c5fa2.tar.gz
media: Fix media_open() to clear filp->private_data in error leg
commit d40ec6fdb0b03b7be4c7923a3da0e46bf943740a upstream. Fix media_open() to clear filp->private_data when file open fails. Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/media/media-devnode.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index ebf9626e5ae5a..a8cb52dc8c4ff 100644
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -181,6 +181,7 @@ static int media_open(struct inode *inode, struct file *filp)
ret = mdev->fops->open(filp);
if (ret) {
put_device(&mdev->dev);
+ filp->private_data = NULL;
return ret;
}
}