summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-usb/ttusb2.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-04-09 21:13:13 +0200
committerMichael Krufky <mkrufky@linuxtv.org>2008-04-09 21:13:13 +0200
commit6085c418e42063695cf895d7af008edc36f3fde2 (patch)
treebe954212c7c29c2e9a7e954ab1059373288e2dd5 /linux/drivers/media/dvb/dvb-usb/ttusb2.c
parent0010cbf0481fc24cd2caef60f52e2db0fed03d8f (diff)
downloadmediapointer-dvb-s2-6085c418e42063695cf895d7af008edc36f3fde2.tar.gz
mediapointer-dvb-s2-6085c418e42063695cf895d7af008edc36f3fde2.tar.bz2
Adds selectable adapter numbers as per module option
From: Janne Grunau <janne-dvb@grunau.be> The adapter_nr module options can be used to allocate static adapter numbers on a driver level. It avoids problems with changing DVB apapter numbers after warm/cold boot or device unplugging and repluging. Each driver holds DVB_MAX_ADAPTER long array of the preferred order of adapter numbers. options dvb-usb-dib0700 adapter_nr=7,6,5,4,3,2,1,0 would result in a reversed allocation of adapter numbers. With adapter_nr=2,5 it tries first to get adapter number 2 and 5. If both are already in use it will allocate the lowest free adapter number. Signed-off-by: Janne Grunau <janne-dvb@grunau.be> Acked-by: Hermann Pitton <hermann.pitton@arcor.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/ttusb2.c')
-rw-r--r--linux/drivers/media/dvb/dvb-usb/ttusb2.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/ttusb2.c b/linux/drivers/media/dvb/dvb-usb/ttusb2.c
index 572760414..dd11a1fee 100644
--- a/linux/drivers/media/dvb/dvb-usb/ttusb2.c
+++ b/linux/drivers/media/dvb/dvb-usb/ttusb2.c
@@ -37,6 +37,8 @@ static int dvb_usb_ttusb2_debug;
module_param_named(debug,dvb_usb_ttusb2_debug, int, 0644);
MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able))." DVB_USB_DEBUG_STATUS);
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
struct ttusb2_state {
u8 id;
};
@@ -187,8 +189,10 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400;
static int ttusb2_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
- if (dvb_usb_device_init(intf, &ttusb2_properties, THIS_MODULE, NULL) == 0 ||
- dvb_usb_device_init(intf, &ttusb2_properties_s2400, THIS_MODULE, NULL) == 0)
+ if (0 == dvb_usb_device_init(intf, &ttusb2_properties,
+ THIS_MODULE, NULL, adapter_nr) ||
+ 0 == dvb_usb_device_init(intf, &ttusb2_properties_s2400,
+ THIS_MODULE, NULL, adapter_nr))
return 0;
return -ENODEV;
}