diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-03 22:01:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-03 22:01:22 -0300 |
| commit | e5e653212e9f537a69f88edaa1a7a2fe4e0dac52 (patch) | |
| tree | 12a6d78944e39d86d0d1eb252ef57ea207ccc73a /linux/drivers/media/video/v4l2-dev.c | |
| parent | ef1ebf00be0fc71da604ae83054e10a99141adf7 (diff) | |
| parent | adacc8e7aa06a06a13dd78a533e0b2d02341887f (diff) | |
| download | mediapointer-dvb-s2-e5e653212e9f537a69f88edaa1a7a2fe4e0dac52.tar.gz mediapointer-dvb-s2-e5e653212e9f537a69f88edaa1a7a2fe4e0dac52.tar.bz2 | |
merge: http://udev.netup.ru/hg/v4l-dvb-netup
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-dev.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-dev.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c index e6dc1279a..861e3194f 100644 --- a/linux/drivers/media/video/v4l2-dev.c +++ b/linux/drivers/media/video/v4l2-dev.c @@ -404,12 +404,11 @@ int video_register_device_index(struct video_device *vdev, int type, int nr, /* A minor value of -1 marks this video device as never having been registered */ - if (vdev) - vdev->minor = -1; + vdev->minor = -1; /* the release callback MUST be present */ - WARN_ON(!vdev || !vdev->release); - if (!vdev || !vdev->release) + WARN_ON(!vdev->release); + if (!vdev->release) return -EINVAL; /* Part 1: check device type */ |