From 7309759ea33b77fc45c171a3cc78c501ed758bb8 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 17 Apr 2008 22:55:29 +0000 Subject: V4L: ov511 - use usb_interface as parent, not usb_device From: Kay Sievers The current code creates a bogus DEVPATH: /devices/pci0000:00/0000:00:1d.0/usb1/1-2/video4linux/video0 while it should be: /devices/pci0000:00/0000:00:1d.0/usb1/1-2/1-2:1.0/video4linux/video0 Signed-off-by: Kay Sievers Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/ov511.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/drivers/media/video/ov511.c') diff --git a/linux/drivers/media/video/ov511.c b/linux/drivers/media/video/ov511.c index cba851d18..4c8050667 100644 --- a/linux/drivers/media/video/ov511.c +++ b/linux/drivers/media/video/ov511.c @@ -5838,7 +5838,7 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id) goto error; memcpy(ov->vdev, &vdev_template, sizeof(*ov->vdev)); - ov->vdev->dev = &dev->dev; + ov->vdev->dev = &intf->dev; video_set_drvdata(ov->vdev, ov); for (i = 0; i < OV511_MAX_UNIT_VIDEO; i++) { -- cgit v1.2.3 From 02a21b23c5b7676b326374708201900bc6d6ca0a Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 26 Apr 2008 14:42:57 -0300 Subject: backport commit d3135846f6c1858dbad6ccb780a42e6c98953e6d From: Mauro Carvalho Chehab kernel-sync: Author: Matthew Wilcox drivers: Remove unnecessary inclusions of asm/semaphore.h None of these files use any of the functionality promised by asm/semaphore.h. It's possible that they rely on it dragging in some unrelated header file, but I can't build all these files, so we'll have fix any build failures as they come up. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/ov511.c | 1 - 1 file changed, 1 deletion(-) (limited to 'linux/drivers/media/video/ov511.c') diff --git a/linux/drivers/media/video/ov511.c b/linux/drivers/media/video/ov511.c index 4c8050667..9676c1d6f 100644 --- a/linux/drivers/media/video/ov511.c +++ b/linux/drivers/media/video/ov511.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.3