From a0758b2a141bd98cd9571675cd0f82eb45c07ccb Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 22 Apr 2008 14:45:47 -0300
Subject: [PATCH] --- yaml --- r: 92465 b: refs/heads/master c:
 1c659689fe9959c017bfaaa8301243f7d99f1a46 h: refs/heads/master i:   92463:
 63a706fd110f0d32e99b9a481a37b5a64bcdf6b5 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/usbvideo/usbvideo.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 213076365e3d..97d086235727 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6f34d7adddb144c3b450e15df3749f0e0a651c6
+refs/heads/master: 1c659689fe9959c017bfaaa8301243f7d99f1a46
diff --git a/trunk/drivers/media/video/usbvideo/usbvideo.c b/trunk/drivers/media/video/usbvideo/usbvideo.c
index f1ccf59545d4..7f3cdc9a0624 100644
--- a/trunk/drivers/media/video/usbvideo/usbvideo.c
+++ b/trunk/drivers/media/video/usbvideo/usbvideo.c
@@ -1035,10 +1035,10 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
 		     __FUNCTION__, uvd->iface, uvd->video_endp, uvd->paletteBits);
 	}
 	if (uvd->dev == NULL) {
-		err("%s: uvd->dev == NULL", __FUNCTION__);
+		err("%s: uvd->dev == NULL", __func__);
 		return -EINVAL;
 	}
-	uvd->vdev.dev=&(uvd->dev->dev);
+	uvd->vdev.dev = &uvd->dev->dev;
 	if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
 		err("%s: video_register_device failed", __FUNCTION__);
 		return -EPIPE;