From patchwork Wed Jun 10 19:44:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 1193 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Wed, 10 Jun 2009 19:44:44 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Wed, 10 Jun 2009 16:46:37 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1METj2-0000UH-F0; Wed, 10 Jun 2009 19:44:44 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757830AbZFJToj (ORCPT + 1 other); Wed, 10 Jun 2009 15:44:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758757AbZFJToj (ORCPT ); Wed, 10 Jun 2009 15:44:39 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:37431 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757830AbZFJToh (ORCPT ); Wed, 10 Jun 2009 15:44:37 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n5AJiMo3029951 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Jun 2009 12:44:23 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n5AJiMDU031766; Wed, 10 Jun 2009 12:44:22 -0700 Message-Id: <200906101944.n5AJiMDU031766@imap1.linux-foundation.org> Subject: [patch 4/6] V4L/pwc: use usb_interface as parent, not usb_device To: mchehab@infradead.org Cc: linux-media@vger.kernel.org, akpm@linux-foundation.org, mzxreary@0pointer.de, kay.sievers@vrfy.org From: akpm@linux-foundation.org Date: Wed, 10 Jun 2009 12:44:21 -0700 X-Spam-Status: No, hits=-3.502 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Lennart Poettering The current code creates a sysfs device path where the video4linux device is child of the usb device itself instead of the interface it belongs to. That is evil and confuses udev. This patch does basically the same thing as Kay's similar patch for the ov511 driver: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ce96d0a44a4f8d1bb3dc12b5e98cb688c1bc730d Cc: Kay Sievers Cc: Mauro Carvalho Chehab Signed-off-by: Lennart Poettering Signed-off-by: Andrew Morton --- drivers/media/video/pwc/pwc-if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/media/video/pwc/pwc-if.c~v4l-pwc-use-usb_interface-as-parent-not-usb_device drivers/media/video/pwc/pwc-if.c --- a/drivers/media/video/pwc/pwc-if.c~v4l-pwc-use-usb_interface-as-parent-not-usb_device +++ a/drivers/media/video/pwc/pwc-if.c @@ -1783,7 +1783,7 @@ static int usb_pwc_probe(struct usb_inte return -ENOMEM; } memcpy(pdev->vdev, &pwc_template, sizeof(pwc_template)); - pdev->vdev->parent = &(udev->dev); + pdev->vdev->parent = &intf->dev; strcpy(pdev->vdev->name, name); video_set_drvdata(pdev->vdev, pdev);