Changeset 29e7cc7 in mainline for uspace/drv/block/pci-ide/main.c

Timestamp:

2025-04-18T15:14:10Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (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 branch 'upstream/master' into helenraid

File:

• uspace/drv/block/pci-ide/main.c (modified) (2 diffs)

uspace/drv/block/pci-ide/main.c

@@ -136 +136 @@
         pci_ide_hwres_t res;
         async_sess_t *parent_sess;
+        unsigned chans;
         errno_t rc;
 
@@ -157 +158 @@
                 goto error;
 
+        chans = 0;
+
         rc = pci_ide_channel_init(ctrl, &ctrl->channel[0], 0, &res);
-        if (rc == ENOENT)
+        if (rc == EOK)
+                ++chans;
+        else if (rc != ENOENT)
                 goto error;
 
         rc = pci_ide_channel_init(ctrl, &ctrl->channel[1], 1, &res);
-        if (rc == ENOENT)
-                goto error;
-
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed initializing ATA controller.");
+        if (rc == EOK)
+                ++chans;
+        else if (rc != ENOENT)
+                goto error;
+
+        if (chans == 0) {
+                ddf_msg(LVL_ERROR, "No PCI IDE devices found.");
                 rc = EIO;
                 goto error;