Changeset 743f2cdd in mainline

Timestamp:

2024-06-20T07:24:07Z (2 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

ec50d65e

Parents:

7cec216

git-author:

Jiri Svoboda <jiri@…> (2024-06-19 17:23:44)

git-committer:

Jiri Svoboda <jiri@…> (2024-06-20 07:24:07)

Message:

Fix error path when adding ATA devices

This would errorneously cause us to add two devices when there were
no devices on the channel.

File:

• uspace/lib/ata/src/ata.c (modified) (3 diffs)

uspace/lib/ata/src/ata.c

@@ -179 +179 @@
         int n_disks;
         bool irq_inited = false;
+        bool dev_added[MAX_DEVICES];
+
+        for (i = 0; i < MAX_DEVICES; i++)
+                dev_added[i] = false;
 
         ata_msg_debug(chan, "ata_channel_initialize()");
@@ -212 +216 @@
                         goto error;
                 }
+                dev_added[i] = true;
                 ++n_disks;
         }
@@ -224 +229 @@
 error:
         for (i = 0; i < MAX_DEVICES; i++) {
-                if (ata_device_add(&chan->device[i]) != EOK) {
-                        ata_msg_error(chan, "Unable to remove device %d.", i);
+                if (dev_added[i]) {
+                        rc = ata_device_remove(&chan->device[i]);
+                        if (rc != EOK) {
+                                ata_msg_error(chan,
+                                    "Unable to remove device %d.", i);
+                        }
                 }
         }