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

- use DRIVER_NAME in dprintf.

Browse Source 
- unreserve the device in case init failed.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36749 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2010-05-08 17:44:35 +00:00
parent 07e1164e59
commit 7d8c577325
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/ac97/es1370/es1370.c
+7 -2
View File
@@ -549,13 +549,18 @@ init_driver(void)
#ifdef __HAIKU__ #ifdef __HAIKU__
if ((err = (*pci->reserve_device)(info.bus, info.device, info.function, if ((err = (*pci->reserve_device)(info.bus, info.device, info.function,
DRIVER_NAME, &cards[num_cards])) < B_OK) { DRIVER_NAME, &cards[num_cards])) < B_OK) {
dprintf("es1370: failed to reserve_device(%d, %d, %d,): %s\n", dprintf("%s: failed to reserve_device(%d, %d, %d,): %s\n",
info.bus, info.device, info.function, strerror(err)); DRIVER_NAME, info.bus, info.device, info.function,
strerror(err));
continue; continue;
} }
#endif #endif
if (es1370_setup(&cards[num_cards])) { if (es1370_setup(&cards[num_cards])) {
PRINT(("Setup of es1370 %ld failed\n", num_cards+1)); 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 { else {
num_cards++; num_cards++;