Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357158
b: refs/heads/master
c: aa51496
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Dec 23, 2012
1 parent 1e44344 commit 03cc118
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b5cff595bd005dba8051e9125f0ed28b5ff05c89
refs/heads/master: aa51496b21542855e779a78bf33384002f01acb6
31 changes: 18 additions & 13 deletions trunk/drivers/media/usb/em28xx/em28xx-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -3310,19 +3310,6 @@ static int em28xx_usb_probe(struct usb_interface *interface,
ifnum,
interface->altsetting->desc.bInterfaceNumber);

if (has_audio)
printk(KERN_INFO DRIVER_NAME
": Audio Vendor Class interface %i found\n",
ifnum);
if (has_video)
printk(KERN_INFO DRIVER_NAME
": Video interface %i found\n",
ifnum);
if (has_dvb)
printk(KERN_INFO DRIVER_NAME
": DVB interface %i found\n",
ifnum);

/*
* Make sure we have 480 Mbps of bandwidth, otherwise things like
* video stream wouldn't likely work, since 12 Mbps is generally
Expand Down Expand Up @@ -3361,6 +3348,24 @@ static int em28xx_usb_probe(struct usb_interface *interface,
}
}

if (has_audio)
printk(KERN_INFO DRIVER_NAME
": Audio interface %i found %s\n",
ifnum,
dev->has_audio_class ? "(USB Audio Class)" : "(Vendor Class)");
if (has_video)
printk(KERN_INFO DRIVER_NAME
": Video interface %i found:%s%s\n",
ifnum,
dev->analog_ep_bulk ? " bulk" : "",
dev->analog_ep_isoc ? " isoc" : "");
if (has_dvb)
printk(KERN_INFO DRIVER_NAME
": DVB interface %i found:%s%s\n",
ifnum,
dev->dvb_ep_bulk ? " bulk" : "",
dev->dvb_ep_isoc ? " isoc" : "");

dev->num_alt = interface->num_altsetting;

if ((unsigned)card[nr] < em28xx_bcount)
Expand Down

0 comments on commit 03cc118

Please sign in to comment.