1 | --- i386/libsaio/nvidia.c.orig␉2012-12-16 11:44:04.000000000 +0100␊ |
2 | +++ i386/libsaio/nvidia.c␉2012-12-16 11:50:08.000000000 +0100␊ |
3 | @@ -1608,22 +1608,26 @@␊ |
4 | ␉␉␉}␊ |
5 | ␉␉}␊ |
6 | ␉}␊ |
7 | +␊ |
8 | ␉// At last try the generic names␊ |
9 | ␉for (i = 1; i < (sizeof(nvidia_card_generic) / sizeof(nvidia_card_generic[0])); i++)␊ |
10 | ␉{␊ |
11 | ␉if (nvidia_card_generic[i].device == device_id)␊ |
12 | ␉␉{␊ |
13 | -␉␉␉if (!subsys_id) return nvidia_card_generic[i].name;␊ |
14 | -␉␉␉for (j = 0; j < (sizeof(nvidia_card_vendors) / sizeof(nvidia_card_vendors[0])); j++)␊ |
15 | +␉␉␉if (subsys_id)␊ |
16 | ␉␉␉{␊ |
17 | -␉␉␉␉if (nvidia_card_vendors[j].device == (subsys_id & 0xffff0000))␊ |
18 | +␉␉␉␉for (j = 0; j < (sizeof(nvidia_card_vendors) / sizeof(nvidia_card_vendors[0])); j++)␊ |
19 | ␉␉␉␉{␊ |
20 | -␉␉␉␉␉sprintf(name_model, "%s %s",␊ |
21 | -␉␉␉␉␉␉nvidia_card_vendors[j].name, nvidia_card_generic[i].name);␊ |
22 | -␉␉␉␉␉name_model[sizeof(name_model) - 1] = '\0';␊ |
23 | -␉␉␉␉␉return name_model;␊ |
24 | +␉␉␉␉␉if (nvidia_card_vendors[j].device == (subsys_id & 0xffff0000))␊ |
25 | +␉␉␉␉␉{␊ |
26 | +␉␉␉␉␉␉sprintf(name_model, "%s %s",␊ |
27 | +␉␉␉␉␉␉␉nvidia_card_vendors[j].name, nvidia_card_generic[i].name);␊ |
28 | +␉␉␉␉␉␉name_model[sizeof(name_model) - 1] = '\0';␊ |
29 | +␉␉␉␉␉␉return name_model;␊ |
30 | +␉␉␉␉␉}␊ |
31 | ␉␉␉␉}␊ |
32 | ␉␉␉}␊ |
33 | +␉␉␉return nvidia_card_generic[i].name;␊ |
34 | ␉␉}␊ |
35 | ␉}␊ |
36 | ␉return nvidia_card_generic[0].name;␊ |
37 |