stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

linuxdvb: fix bug stopping adapter path fallback working. fixes #1855.

Browse source
This commit is contained in:
Adam Sutton 2013-12-12 22:32:16 +00:00
parent 6c3aca2880
commit 6f62adc287
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/input/mpegts/linuxdvb/linuxdvb_device.c
View file

@ -38,6 +38,7 @@
* BUS str table
*/
static struct strtab bustab[] = {
{ "NONE", BUS_NONE },
{ "PCI", BUS_PCI },
{ "USB1", BUS_USB1 },
{ "USB2", BUS_USB2 },
@ -61,6 +62,9 @@ get_device_info ( device_info_t *di, int a )
ssize_t c;
int mina = a;
/* Clear */
memset(di, 0, sizeof(device_info_t));
/* Check for subsystem */
#define DVB_DEV_PATH "/sys/class/dvb/dvb%d.frontend0/device"
snprintf(path, sizeof(path), DVB_DEV_PATH "/subsystem", a);
@ -135,7 +139,7 @@ get_device_info ( device_info_t *di, int a )
di->di_min_adapter = mina;
/* Create ID */
if (*di->di_path && di->di_dev) {
if (*di->di_path && di->di_dev && di->di_bus) {
snprintf(buf, sizeof(buf), "%s/%s/%04x:%04x",
devinfo_bus2str(di->di_bus), di->di_path,
di->di_dev >> 16, di->di_dev & 0xFFFF);