summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-05-09 08:55:09 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:59:32 +0900
commit3d6b90310cdcab984e80e643c702b3492c1bce99 (patch)
treed1ad3cfeda25ea37c2c6179c3ab891a55164904a
parent13bf0bdea9fdf0ae54725f9a3d29d6ae2eb7d4d8 (diff)
downloadlinux-3.10-3d6b90310cdcab984e80e643c702b3492c1bce99.tar.gz
linux-3.10-3d6b90310cdcab984e80e643c702b3492c1bce99.tar.bz2
linux-3.10-3d6b90310cdcab984e80e643c702b3492c1bce99.zip
upstream: [media] Staging: dt3155v4l: set error code on failure
We should be returning -ENOMEM here instead of success. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/staging/media/dt3155v4l/dt3155v4l.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index b2ebd2c4d20..756e726c9a7 100644
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -907,8 +907,10 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (!pd)
return -ENOMEM;
pd->vdev = video_device_alloc();
- if (!pd->vdev)
+ if (!pd->vdev) {
+ err = -ENOMEM;
goto err_video_device_alloc;
+ }
*pd->vdev = dt3155_vdev;
pci_set_drvdata(pdev, pd); /* for use in dt3155_remove() */
video_set_drvdata(pd->vdev, pd); /* for use in video_fops */