From patchwork Tue Jan 20 22:18:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Klimov X-Patchwork-Id: 436 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Tue, 20 Jan 2009 22:18:17 +0000 Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1LPOvJ-00053L-7Y for mchehab@infradead.org; Tue, 20 Jan 2009 22:18:17 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757356AbZATWSQ (ORCPT ); Tue, 20 Jan 2009 17:18:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757221AbZATWSQ (ORCPT ); Tue, 20 Jan 2009 17:18:16 -0500 Received: from fg-out-1718.google.com ([72.14.220.153]:6896 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756834AbZATWSO (ORCPT ); Tue, 20 Jan 2009 17:18:14 -0500 Received: by fg-out-1718.google.com with SMTP id 19so1662856fgg.17 for ; Tue, 20 Jan 2009 14:18:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=Gc/3hZFGTvUuy2aYqTqDZgNrXO09ugO8YzP6SM8TA9M=; b=wUUcLYtvYCruR0R2SpTmThZ6g+cAY6lUFyLKGDhODLbzmpirDkEwd1mtkVZBXsrLL/ JSMaP7ZWIuRZo6DYqAzHmg9n3rg8TQG9fRbmLfIbpkZyRCl0hhEM7ss0MMH22E+k0ndz 0KargZ5yJloEFw2eZXLY46I/pA9akkxwz8IpQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=Dw/QguHqkTR3vG5yOaOtIub65cbM11Gp3jD7EYZqqrjWhNzBikkjkiYKNs0P+gJBfQ gh9TiUZtGOfjyQqtKAj890WXZceASh75dRFoHwE9wyCIf39KUuWKWJX0hNV87rvSgFlP oDQvOyCtxsw+BOQn+h7qATj+aonHZezoNhMlY= Received: by 10.86.74.4 with SMTP id w4mr1502190fga.2.1232489892800; Tue, 20 Jan 2009 14:18:12 -0800 (PST) Received: from ?192.168.1.42? (gw.zunet.ru [217.67.117.64]) by mx.google.com with ESMTPS id d4sm1873002fga.51.2009.01.20.14.18.11 (version=SSLv3 cipher=RC4-MD5); Tue, 20 Jan 2009 14:18:12 -0800 (PST) Subject: [PATCH] v4l/dvb: use usb_make_path in usb-radio drivers From: Alexey Klimov To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Douglas Schilling Landgraf , Tobias Lorenz Date: Wed, 21 Jan 2009 01:18:26 +0300 Message-Id: <1232489906.30506.10.camel@tux.localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.24.2 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Place usb_make_path in dsbr100.c, radio-mr800.c, radio-si470x.c that used when reporting bus_info information in vidioc_querycap. Signed-off-by: Alexey Klimov diff -r f4d7d0b84940 linux/drivers/media/radio/dsbr100.c --- a/linux/drivers/media/radio/dsbr100.c Sun Jan 18 10:55:38 2009 +0000 +++ b/linux/drivers/media/radio/dsbr100.c Wed Jan 21 01:07:34 2009 +0300 @@ -393,9 +393,11 @@ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability *v) { + struct dsbr100_device *radio = video_drvdata(file); + strlcpy(v->driver, "dsbr100", sizeof(v->driver)); strlcpy(v->card, "D-Link R-100 USB FM Radio", sizeof(v->card)); - sprintf(v->bus_info, "USB"); + usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info)); v->version = RADIO_VERSION; v->capabilities = V4L2_CAP_TUNER; return 0; diff -r f4d7d0b84940 linux/drivers/media/radio/radio-mr800.c --- a/linux/drivers/media/radio/radio-mr800.c Sun Jan 18 10:55:38 2009 +0000 +++ b/linux/drivers/media/radio/radio-mr800.c Wed Jan 21 01:07:34 2009 +0300 @@ -316,9 +316,11 @@ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability *v) { + struct amradio_device *radio = video_drvdata(file); + strlcpy(v->driver, "radio-mr800", sizeof(v->driver)); strlcpy(v->card, "AverMedia MR 800 USB FM Radio", sizeof(v->card)); - sprintf(v->bus_info, "USB"); + usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info)); v->version = RADIO_VERSION; v->capabilities = V4L2_CAP_TUNER; return 0; diff -r f4d7d0b84940 linux/drivers/media/radio/radio-si470x.c --- a/linux/drivers/media/radio/radio-si470x.c Sun Jan 18 10:55:38 2009 +0000 +++ b/linux/drivers/media/radio/radio-si470x.c Wed Jan 21 01:07:34 2009 +0300 @@ -1202,9 +1202,11 @@ static int si470x_vidioc_querycap(struct file *file, void *priv, struct v4l2_capability *capability) { + struct si470x_device *radio = video_drvdata(file); + strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver)); strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card)); - sprintf(capability->bus_info, "USB"); + usb_make_path(radio->usbdev, capability->bus_info, sizeof(capability->bus_info)); capability->version = DRIVER_KERNEL_VERSION; capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_TUNER | V4L2_CAP_RADIO;