Changeset b2d06fa in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2010-12-25T17:14:36Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

092e4f1

Parents:

59e9398b (diff), 3ac66f69 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/pciintel/pci.c (modified) (2 diffs)

uspace/drv/pciintel/pci.c

@@ -452 +452 @@
 static int pci_add_device(device_t *dev)
 {
+        int rc;
+
         printf(NAME ": pci_add_device\n");
         
@@ -466 +468 @@
                     "parent's driver.\n");
                 delete_pci_bus_data(bus_data);
-                return EPARTY;  /* FIXME: use another EC */
+                return dev->parent_phone;
         }
         
         hw_resource_list_t hw_resources;
         
-        if (!get_hw_resources(dev->parent_phone, &hw_resources)) {
+        rc = get_hw_resources(dev->parent_phone, &hw_resources);
+        if (rc != EOK) {
                 printf(NAME ": pci_add_device failed to get hw resources for "
                     "the device.\n");
                 delete_pci_bus_data(bus_data);
                 ipc_hangup(dev->parent_phone);
-                return EPARTY;  /* FIXME: use another EC */
+                return rc;
         }