diff options
| author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2014-07-25 14:48:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-26 16:44:30 -0300 |
| commit | 3c0f90e14caf97896cd347b3b9fec8cba6b56b14 (patch) | |
| tree | da3ec7bbf7e9dddae622b0de0428bb867d0f4e58 | |
| parent | 917ba6b0b6707b6e6ca257461ceadff1235e8b2c (diff) | |
| download | linux-stable-3c0f90e14caf97896cd347b3b9fec8cba6b56b14.tar.gz linux-stable-3c0f90e14caf97896cd347b3b9fec8cba6b56b14.tar.bz2 linux-stable-3c0f90e14caf97896cd347b3b9fec8cba6b56b14.zip | |
[media] em28xx-v4l: simplify em28xx_v4l2_open() by using v4l2_fh_open()
Instead of calling
...
struct v4l2_fh *fh = kzalloc(sizeof(*fh), GFP_KERNEL);
filp->private_data = fh;
v4l2_fh_init(fh, vdev);
v4l2_fh_add(fh);
...
simply use function v4l2_fh_open() which does all of these calls for us.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 4eb4a6ac04f7..3a7ec3bf458e 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -1868,7 +1868,7 @@ static int em28xx_v4l2_open(struct file *filp) struct em28xx *dev = video_drvdata(filp); struct em28xx_v4l2 *v4l2 = dev->v4l2; enum v4l2_buf_type fh_type = 0; - struct v4l2_fh *fh; + int ret; switch (vdev->vfl_type) { case VFL_TYPE_GRABBER: @@ -1889,14 +1889,14 @@ static int em28xx_v4l2_open(struct file *filp) if (mutex_lock_interruptible(&dev->lock)) return -ERESTARTSYS; - fh = kzalloc(sizeof(struct v4l2_fh), GFP_KERNEL); - if (!fh) { - em28xx_errdev("em28xx-video.c: Out of memory?!\n"); + + ret = v4l2_fh_open(filp); + if (ret) { + em28xx_errdev("%s: v4l2_fh_open() returned error %d\n", + __func__, ret); mutex_unlock(&dev->lock); - return -ENOMEM; + return ret; } - v4l2_fh_init(fh, vdev); - filp->private_data = fh; if (v4l2->users == 0) { em28xx_set_mode(dev, EM28XX_ANALOG_MODE); @@ -1921,7 +1921,6 @@ static int em28xx_v4l2_open(struct file *filp) v4l2->users++; mutex_unlock(&dev->lock); - v4l2_fh_add(fh); return 0; } |