blob: e298f2bebe74713e210a41fe231995295c4db242 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 983db75..1a7aa58 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -296,9 +296,9 @@ static int dvbdev_check_free_adapter_num(int num)
return 1;
}
-static int dvbdev_get_free_adapter_num (void)
+static int dvbdev_get_free_adapter_num (int start_num)
{
- int num = 0;
+ int num = start_num;
while (num < DVB_MAX_ADAPTERS) {
if (dvbdev_check_free_adapter_num(num))
@@ -316,16 +316,17 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name,
{
int i, num;
+ char *vu_name = strstr(name, "_vuplus_");
mutex_lock(&dvbdev_register_lock);
for (i = 0; i < DVB_MAX_ADAPTERS; ++i) {
num = adapter_nums[i];
- if (num >= 0 && num < DVB_MAX_ADAPTERS) {
+ if (num >= vu_name? 0:1 && num < DVB_MAX_ADAPTERS) {
/* use the one the driver asked for */
if (dvbdev_check_free_adapter_num(num))
break;
} else {
- num = dvbdev_get_free_adapter_num();
+ num = dvbdev_get_free_adapter_num(vu_name? 0:1);
break;
}
num = -1;
|