From 637812eb4a402104724d3361e36b89c3eb656477 Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Sun, 18 Feb 2007 00:51:10 +0000 Subject: [PATCH] init those pointers before using them git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20153 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/busses/ide/ahci/ahci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/busses/ide/ahci/ahci.c b/src/add-ons/kernel/busses/ide/ahci/ahci.c index c2d49a2614..7c4a741a37 100644 --- a/src/add-ons/kernel/busses/ide/ahci/ahci.c +++ b/src/add-ons/kernel/busses/ide/ahci/ahci.c @@ -165,6 +165,9 @@ controller_probe(device_node_handle parent) TRACE("controller_probe\n"); + if (dm->init_driver(parent, NULL, (driver_module_info **)&pci, (void **)&device) != B_OK) + return B_ERROR; + res = pci->find_pci_capability(device, PCI_cap_id_sata, &cap_ofs); if (res == B_OK) { TRACE("PCI SATA capability found at offset 0x%x\n", cap_ofs); @@ -173,10 +176,7 @@ controller_probe(device_node_handle parent) TRACE("satacr0 = 0x%08x, satacr1 = 0x%08x\n", satacr0, satacr1); } - return B_ERROR; - - if (dm->init_driver(parent, NULL, (driver_module_info **)&pci, (void **)&device) != B_OK) - return B_ERROR; + goto err; device_id = pci->read_pci_config(device, PCI_device_id, 2); int_num = pci->read_pci_config(device, PCI_interrupt_line, 1);