Changes in uspace/drv/block/isa-ide/main.c [07039850:2a5d4649] in mainline

File:

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

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

@@ -169 +169 @@
         isa_ide_ctrl_t *ctrl;
         isa_ide_hwres_t res;
+        unsigned chans;
         errno_t rc;
 
@@ -187 +188 @@
         ctrl->dev = dev;
 
+        chans = 0;
+
         rc = isa_ide_channel_init(ctrl, &ctrl->channel[0], 0, &res);
-        if (rc == ENOENT)
+        if (rc == EOK)
+                ++chans;
+        else if (rc != ENOENT)
                 goto error;
 
         rc = isa_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 ISA IDE devices found.");
                 rc = EIO;
                 goto error;