From 7d8c577325f98f737f8b10806c2ae9b579350227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 8 May 2010 17:44:35 +0000 Subject: [PATCH] - use DRIVER_NAME in dprintf. - unreserve the device in case init failed. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36749 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/audio/ac97/es1370/es1370.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/ac97/es1370/es1370.c b/src/add-ons/kernel/drivers/audio/ac97/es1370/es1370.c index ad50184bcc..be6e54150f 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/es1370/es1370.c +++ b/src/add-ons/kernel/drivers/audio/ac97/es1370/es1370.c @@ -549,13 +549,18 @@ init_driver(void) #ifdef __HAIKU__ if ((err = (*pci->reserve_device)(info.bus, info.device, info.function, DRIVER_NAME, &cards[num_cards])) < B_OK) { - dprintf("es1370: failed to reserve_device(%d, %d, %d,): %s\n", - info.bus, info.device, info.function, strerror(err)); + dprintf("%s: failed to reserve_device(%d, %d, %d,): %s\n", + DRIVER_NAME, info.bus, info.device, info.function, + strerror(err)); continue; } #endif if (es1370_setup(&cards[num_cards])) { PRINT(("Setup of es1370 %ld failed\n", num_cards+1)); +#ifdef __HAIKU__ + (*pci->unreserve_device)(info.bus, info.device, info.function, + DRIVER_NAME, &cards[num_cards]); +#endif } else { num_cards++;