diff options
author | Janne Grunau <janne-dvb@grunau.be> | 2008-04-09 18:13:13 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:08:00 -0400 |
commit | 78e92006f410a4044f8c1760c25ac9d11d259aa2 (patch) | |
tree | 293de8abe261420df2db5e12936ec2721ea52c7c /drivers/media/dvb/dvb-usb/ttusb2.c | |
parent | 9950c1b5b4b86d4aae12853c2f0a0ef11d976764 (diff) |
V4L/DVB (7538): Adds selectable adapter numbers as per module option
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/ttusb2.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/ttusb2.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/ttusb2.c b/drivers/media/dvb/dvb-usb/ttusb2.c index 0eb33378254b..706687c78506 100644 --- a/drivers/media/dvb/dvb-usb/ttusb2.c +++ b/drivers/media/dvb/dvb-usb/ttusb2.c | |||
@@ -37,6 +37,8 @@ static int dvb_usb_ttusb2_debug; | |||
37 | module_param_named(debug,dvb_usb_ttusb2_debug, int, 0644); | 37 | module_param_named(debug,dvb_usb_ttusb2_debug, int, 0644); |
38 | MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able))." DVB_USB_DEBUG_STATUS); | 38 | MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able))." DVB_USB_DEBUG_STATUS); |
39 | 39 | ||
40 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); | ||
41 | |||
40 | struct ttusb2_state { | 42 | struct ttusb2_state { |
41 | u8 id; | 43 | u8 id; |
42 | }; | 44 | }; |
@@ -181,8 +183,10 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400; | |||
181 | static int ttusb2_probe(struct usb_interface *intf, | 183 | static int ttusb2_probe(struct usb_interface *intf, |
182 | const struct usb_device_id *id) | 184 | const struct usb_device_id *id) |
183 | { | 185 | { |
184 | if (dvb_usb_device_init(intf, &ttusb2_properties, THIS_MODULE, NULL) == 0 || | 186 | if (0 == dvb_usb_device_init(intf, &ttusb2_properties, |
185 | dvb_usb_device_init(intf, &ttusb2_properties_s2400, THIS_MODULE, NULL) == 0) | 187 | THIS_MODULE, NULL, adapter_nr) || |
188 | 0 == dvb_usb_device_init(intf, &ttusb2_properties_s2400, | ||
189 | THIS_MODULE, NULL, adapter_nr)) | ||
186 | return 0; | 190 | return 0; |
187 | return -ENODEV; | 191 | return -ENODEV; |
188 | } | 192 | } |