From f05409cfb1e8369e98928337dd1da23077edee3f Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Wed, 10 Nov 2010 23:40:55 +0000 Subject: [PATCH] Moved the unreserve_device() from ice_1712_shutdown() to uninit_driver(), to keep consistency between drivers. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39401 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/audio/ice1712/ice1712.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c index 8fef66f58c..9aa4f6c825 100644 --- a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c +++ b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c @@ -434,9 +434,6 @@ ice_1712_shutdown(ice1712 *ice) codec_write(ice, AK45xx_RESET_REGISTER, 0x00); save_settings(ice); - - (*pci->unreserve_device)(ice->info.bus, ice->info.device, - ice->info.function, DRIVER_NAME, ice); } @@ -451,6 +448,9 @@ uninit_driver(void) for (ix = 0; ix < cnt; ix++) { ice_1712_shutdown(&cards[ix]); + (*pci->unreserve_device)(cards[ix].info.bus, + cards[ix].info.device, cards[ix].info.function, + DRIVER_NAME, &cards[ix]); } memset(&cards, 0, sizeof(cards)); put_module(B_MPU_401_MODULE_NAME);