The patch number 9767 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
em28xx: improve board description messages
Print manufacturer/product info from USB device and also card entry.
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/video/em28xx/em28xx-cards.c | 3 ++-
linux/drivers/media/video/em28xx/em28xx-video.c | 15 ++++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff -r cf29f09b1e4b -r 7100e78482d7
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Thu Nov 27 15:32:17
2008 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Sat Nov 29 00:46:43
2008 -0200
@@ -1427,7 +1427,8 @@ void em28xx_pre_card_setup(struct em28xx
em28xx_set_model(dev);
- em28xx_info("Found %s\n", dev->board.name);
+ em28xx_info("Identified as %s (card=%d)\n",
+ dev->board.name, dev->model);
/* Set the default GPO/GPIO for legacy devices */
dev->reg_gpo_num = EM2880_R04_GPO;
diff -r cf29f09b1e4b -r 7100e78482d7
linux/drivers/media/video/em28xx/em28xx-video.c
--- a/linux/drivers/media/video/em28xx/em28xx-video.c Thu Nov 27 15:32:17
2008 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c Sat Nov 29 00:46:43
2008 -0200
@@ -2259,6 +2259,7 @@ static int em28xx_usb_probe(struct usb_i
int retval = -ENODEV;
int i, nr, ifnum, isoc_pipe;
char *speed;
+ char descr[255] = "";
udev = usb_get_dev(interface_to_usbdev(interface));
ifnum = interface->altsetting[0].desc.bInterfaceNumber;
@@ -2331,8 +2332,20 @@ static int em28xx_usb_probe(struct usb_i
speed = "unknown";
}
- printk(DRIVER_NAME ": New video device @ %s Mbps "
+ if (udev->manufacturer)
+ strlcpy(descr, udev->manufacturer, sizeof(descr));
+
+ if (udev->product) {
+ if (*descr)
+ strlcat(descr, " ", sizeof(descr));
+ strlcat(descr, udev->product, sizeof(descr));
+ }
+ if (*descr)
+ strlcat(descr, " ", sizeof(descr));
+
+ printk(DRIVER_NAME ": New device %s@ %s Mbps "
"(%04x:%04x, interface %d, class %d)\n",
+ descr,
speed,
le16_to_cpu(udev->descriptor.idVendor),
le16_to_cpu(udev->descriptor.idProduct),
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/7100e78482d70ee9acf90f2c15848f6002f89b7d
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
