From ee9a07fc5252ae4d1ab184dca91f569f454e68d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 8 May 2010 22:10:08 +0000 Subject: [PATCH] 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. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36760 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/audio/ac97/auich/auich.c | 3 +-- src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c | 3 +-- src/add-ons/kernel/drivers/audio/echo/echo.cpp | 3 +-- src/add-ons/kernel/drivers/audio/emuxki/emuxki.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c b/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c index 9f98b31210..e9fdcabbde 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c +++ b/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c @@ -752,7 +752,7 @@ init_driver(void) if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci)) 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 && (info.device_id == INTEL_82443MX_AC97_DEVICE_ID || info.device_id == INTEL_82801AA_AC97_DEVICE_ID @@ -809,7 +809,6 @@ init_driver(void) num_cards++; } } - ix++; } if (!num_cards) { PRINT(("no cards\n")); diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c index f1b0263683..a591481a77 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c +++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c @@ -585,7 +585,7 @@ init_driver(void) if (get_module(B_PCI_MODULE_NAME, (module_info **)&pci)) 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 && (info.device_id == VIATECH_82C686_AC97_DEVICE_ID || info.device_id == VIATECH_8233_AC97_DEVICE_ID @@ -616,7 +616,6 @@ init_driver(void) num_cards++; } } - ix++; } if (!num_cards) { PRINT(("no cards\n")); diff --git a/src/add-ons/kernel/drivers/audio/echo/echo.cpp b/src/add-ons/kernel/drivers/audio/echo/echo.cpp index 07c12c9295..8609c60e57 100644 --- a/src/add-ons/kernel/drivers/audio/echo/echo.cpp +++ b/src/add-ons/kernel/drivers/audio/echo/echo.cpp @@ -554,7 +554,7 @@ init_driver(void) if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci)) 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; if (info.vendor_id == VENDOR_ID && @@ -611,7 +611,6 @@ init_driver(void) num_cards++; } } - ix++; } if (!num_cards) { PRINT(("no cards\n")); diff --git a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c index a9bbb9fe03..e340f0b53d 100644 --- a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c +++ b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c @@ -2921,7 +2921,7 @@ init_driver(void) 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 && (info.device_id == CREATIVELABS_SBLIVE_DEVICE_ID #if AUDIGY @@ -2954,7 +2954,6 @@ init_driver(void) num_cards++; } } - ix++; } if (!num_cards) { put_module(B_MPU_401_MODULE_NAME);