---

yaml
---
r: 124273
b: refs/heads/master
c: 8c23998
h: refs/heads/master
i:
  124271: c43bf9a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a18eaf61aadcd7f002ddfa26031525570e6f8b6
+refs/heads/master: 8c2399895dc1b5e8976884d4898e68e61ec23e54

trunk/drivers/media/video/em28xx/em28xx-cards.c

@@ -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;

trunk/drivers/media/video/em28xx/em28xx-video.c

@@ -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),