From 12a9da01c31d12c99ff6d23b139d2278ef4aae30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Mon, 8 Nov 2010 19:13:57 +0000
Subject: [PATCH] =?UTF-8?q?Added=20a=20call=20to=20pci->unreserve=5Fdevice?=
 =?UTF-8?q?()=20in=20uninit=5Fdriver()=20as=20suggested=20by=20Matt=20(tak?=
 =?UTF-8?q?ing=20es1370=20for=20model).=20Fran=C3=A7ois=20please=20review.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39359 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/drivers/audio/ac97/auich/auich.c | 5 +++++
 src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c | 5 +++++
 src/add-ons/kernel/drivers/audio/echo/echo.cpp      | 5 +++++
 src/add-ons/kernel/drivers/audio/emuxki/emuxki.c    | 5 +++++
 src/add-ons/kernel/drivers/audio/ice1712/ice1712.c  | 5 +++++
 5 files changed, 25 insertions(+)

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 02e18cb845..7c1da40f78 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
@@ -874,6 +874,11 @@ uninit_driver(void)
 
 	for (ix=0; ix<cnt; ix++) {
 		auich_shutdown(&cards[ix]);
+#ifdef __HAIKU__
+		(*pci->unreserve_device)(cards[ix].info.bus,
+			cards[ix].info.device, cards[ix].info.function,
+			DRIVER_NAME, &cards[ix]);
+#endif
 	}
 	memset(&cards, 0, sizeof(cards));
 	put_module(B_PCI_MODULE_NAME);
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 a591481a77..bc74378d10 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
@@ -643,6 +643,11 @@ uninit_driver(void)
 
 	for (ix=0; ix<cnt; ix++) {
 		auvia_shutdown(&cards[ix]);
+#ifdef __HAIKU__
+		(*pci->unreserve_device)(cards[ix].info.bus,
+			cards[ix].info.device, cards[ix].info.function,
+			DRIVER_NAME, &cards[ix]);
+#endif
 	}
 	memset(&cards, 0, sizeof(cards));
 	put_module(B_PCI_MODULE_NAME);
diff --git a/src/add-ons/kernel/drivers/audio/echo/echo.cpp b/src/add-ons/kernel/drivers/audio/echo/echo.cpp
index b05ac84578..c4e384e1af 100644
--- a/src/add-ons/kernel/drivers/audio/echo/echo.cpp
+++ b/src/add-ons/kernel/drivers/audio/echo/echo.cpp
@@ -920,6 +920,11 @@ uninit_driver(void)
 	num_cards = 0;
 	for (ix=0; ix<cnt; ix++) {
 		echo_shutdown(&cards[ix]);
+#ifdef __HAIKU__
+		(*pci->unreserve_device)(cards[ix].info.bus,
+			cards[ix].info.device, cards[ix].info.function,
+			DRIVER_NAME, &cards[ix]);
+#endif
 	}
 
 	memset(&cards, 0, sizeof(cards));
diff --git a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
index 94dd324be0..c69a304382 100644
--- a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
+++ b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
@@ -3045,6 +3045,11 @@ uninit_driver(void)
 
 	for (ix=0; ix<cnt; ix++) {
 		emuxki_shutdown(&cards[ix]);
+#ifdef __HAIKU__
+		(*pci->unreserve_device)(cards[ix].info.bus,
+			cards[ix].info.device, cards[ix].info.function,
+			DRIVER_NAME, &cards[ix]);
+#endif
 	}
 	memset(&cards, 0, sizeof(cards));
 	put_module(B_MPU_401_MODULE_NAME);
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c
index 8fef66f58c..ae5f15ef7e 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c
+++ b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c
@@ -451,6 +451,11 @@ uninit_driver(void)
 
 	for (ix = 0; ix < cnt; ix++) {
 		ice_1712_shutdown(&cards[ix]);
+#ifdef __HAIKU__
+		(*pci->unreserve_device)(cards[ix].info.bus,
+			cards[ix].info.device, cards[ix].info.function,
+			DRIVER_NAME, &cards[ix]);
+#endif
 	}
 	memset(&cards, 0, sizeof(cards));
 	put_module(B_MPU_401_MODULE_NAME);