i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Seems I presumed too much about my copy-pasting skills, doing continue in the loop without incrementing doesn't go much further. Fixes busy-loop on error.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36760 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2010-05-08 22:10:08 +00:00
parent 676a46d50b
commit ee9a07fc52
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
+1 -2
View File
@@ -752,7 +752,7 @@ init_driver(void)
if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci)) if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci))
return ENOSYS; return ENOSYS;
while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) { while ((*pci->get_nth_pci_info)(ix++, &info) == B_OK) {
if ((info.vendor_id == INTEL_VENDOR_ID && if ((info.vendor_id == INTEL_VENDOR_ID &&
(info.device_id == INTEL_82443MX_AC97_DEVICE_ID (info.device_id == INTEL_82443MX_AC97_DEVICE_ID
|| info.device_id == INTEL_82801AA_AC97_DEVICE_ID || info.device_id == INTEL_82801AA_AC97_DEVICE_ID
@@ -809,7 +809,6 @@ init_driver(void)
num_cards++; num_cards++;
} }
} }
ix++;
} }
if (!num_cards) { if (!num_cards) {
PRINT(("no cards\n")); PRINT(("no cards\n"));
src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
+1 -2
View File
@@ -585,7 +585,7 @@ init_driver(void)
if (get_module(B_PCI_MODULE_NAME, (module_info **)&pci)) if (get_module(B_PCI_MODULE_NAME, (module_info **)&pci))
return ENOSYS; return ENOSYS;
while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) { while ((*pci->get_nth_pci_info)(ix++, &info) == B_OK) {
if (info.vendor_id == VIATECH_VENDOR_ID && if (info.vendor_id == VIATECH_VENDOR_ID &&
(info.device_id == VIATECH_82C686_AC97_DEVICE_ID (info.device_id == VIATECH_82C686_AC97_DEVICE_ID
|| info.device_id == VIATECH_8233_AC97_DEVICE_ID || info.device_id == VIATECH_8233_AC97_DEVICE_ID
@@ -616,7 +616,6 @@ init_driver(void)
num_cards++; num_cards++;
} }
} }
ix++;
} }
if (!num_cards) { if (!num_cards) {
PRINT(("no cards\n")); PRINT(("no cards\n"));
src/add-ons/kernel/drivers/audio/echo/echo.cpp
+1 -2
View File
@@ -554,7 +554,7 @@ init_driver(void)
if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci)) if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci))
return ENOSYS; return ENOSYS;
while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) { while ((*pci->get_nth_pci_info)(ix++, &info) == B_OK) {
ushort card_type = info.u.h0.subsystem_id & 0xfff0; ushort card_type = info.u.h0.subsystem_id & 0xfff0;
if (info.vendor_id == VENDOR_ID && if (info.vendor_id == VENDOR_ID &&
@@ -611,7 +611,6 @@ init_driver(void)
num_cards++; num_cards++;
} }
} }
ix++;
} }
if (!num_cards) { if (!num_cards) {
PRINT(("no cards\n")); PRINT(("no cards\n"));
src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
+1 -2
View File
@@ -2921,7 +2921,7 @@ init_driver(void)
return ENOSYS; return ENOSYS;
} }
while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) { while ((*pci->get_nth_pci_info)(ix++, &info) == B_OK) {
if (info.vendor_id == CREATIVELABS_VENDOR_ID && if (info.vendor_id == CREATIVELABS_VENDOR_ID &&
(info.device_id == CREATIVELABS_SBLIVE_DEVICE_ID (info.device_id == CREATIVELABS_SBLIVE_DEVICE_ID
#if AUDIGY #if AUDIGY
@@ -2954,7 +2954,6 @@ init_driver(void)
num_cards++; num_cards++;
} }
} }
ix++;
} }
if (!num_cards) { if (!num_cards) {
put_module(B_MPU_401_MODULE_NAME); put_module(B_MPU_401_MODULE_NAME);