Skip to content

Commit

Permalink
[media] em28xx: display the isoc/bulk mode
Browse files Browse the repository at this point in the history
As both bulk and isoc modes can be available, display what it
was found for both DVB and analog.

While here, also displays if audio is provided via USB Audio
Class or via vendor's extension.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Dec 23, 2012
1 parent b5cff59 commit aa51496
Showing 1 changed file with 18 additions and 13 deletions.
31 changes: 18 additions & 13 deletions 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 aa51496

Please sign in to comment.