---

yaml --- r: 138027 b: refs/heads/master c: 428c8d1 h: refs/heads/master i: 138025: 4363192 138023: da1af3f v: v3
git-mirror · Mar 30, 2009 · 901f13b · 901f13b
1 parent d49196b
commit 901f13b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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 */