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

MSI interrupts were not disabled on error.

Browse Source
This commit is contained in:
Axel Dörfler
2012-09-23 20:33:25 +02:00
parent 0e662af473
commit 25b89454c4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
+6 -1
View File
@@ -767,7 +767,7 @@ hda_send_verbs(hda_codec* codec, corb_t* verbs, uint32* responses, uint32 count)
controller->Write16(HDAC_CORB_WRITE_POS, controller->corb_write_pos); controller->Write16(HDAC_CORB_WRITE_POS, controller->corb_write_pos);
status_t status = acquire_sem_etc(codec->response_sem, queued, status_t status = acquire_sem_etc(codec->response_sem, queued,
B_RELATIVE_TIMEOUT, 50000ULL); B_RELATIVE_TIMEOUT, 50000ULL);
if (status < B_OK) if (status != B_OK)
return status; return status;
} }
@@ -958,6 +958,11 @@ corb_rirb_failed:
controller->Write32(HDAC_INTR_CONTROL, 0); controller->Write32(HDAC_INTR_CONTROL, 0);
reset_failed: reset_failed:
if (controller->msi) {
sPCIx86Module->disable_msi(controller->pci_info.bus,
controller->pci_info.device, controller->pci_info.function);
}
remove_io_interrupt_handler(controller->irq, remove_io_interrupt_handler(controller->irq,
(interrupt_handler)hda_interrupt_handler, controller); (interrupt_handler)hda_interrupt_handler, controller);