From 901f13be6ae1131b263cfd86d4ed5499e4dc5c6a Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Tue, 3 Mar 2009 18:51:52 -0300 Subject: [PATCH] --- yaml --- r: 138027 b: refs/heads/master c: 428c8d19167c4597adf4d164262c68befafde9bf h: refs/heads/master i: 138025: 436319298a7ea253b50081a94d339ba081b49c9e 138023: da1af3f26311a3d102655dc6845bc931c55a0790 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-dev.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ca36e27fdc82..85d1e5eeabe4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f985c7006756cb7da452815d4bf040c02decd044 +refs/heads/master: 428c8d19167c4597adf4d164262c68befafde9bf diff --git a/trunk/drivers/media/video/v4l2-dev.c b/trunk/drivers/media/video/v4l2-dev.c index 922b39e79b8e..231f5dbb18b4 100644 --- a/trunk/drivers/media/video/v4l2-dev.c +++ b/trunk/drivers/media/video/v4l2-dev.c @@ -366,12 +366,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 */