Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (9767): em28xx: improve board description messages

Browse source 
Print manufacturer/product info from USB device and also card entry.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2008-11-28 23:46:43 -03:00
parent 6a18eaf61a
commit 8c2399895d
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/media/video/em28xx/em28xx-cards.c
View file

@ -1354,7 +1354,8 @@ void em28xx_pre_card_setup(struct em28xx *dev)
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;

15
drivers/media/video/em28xx/em28xx-video.c
View file

@ -2177,6 +2177,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
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;
@ -2249,8 +2250,20 @@ static int em28xx_usb_probe(struct usb_interface *interface,
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),