]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
IOMUX: Stop dropped consoles
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 21 Dec 2020 12:30:08 +0000 (14:30 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 15 Jan 2021 19:38:00 +0000 (14:38 -0500)
When at some point environment shrinks we need to stop dropped devices.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
common/iomux.c

index 126d92ce850fb0768b3cce0a282d90e257264619..15bf53388559a0035f857f8ca614864be4925dee 100644 (file)
@@ -27,8 +27,8 @@ int iomux_doenv(const int console, const char *arg)
 {
        char *console_args, *temp, **start;
        int i, j, k, io_flag, cs_idx, repeat;
+       struct stdio_dev **cons_set, **old_set;
        struct stdio_dev *dev;
-       struct stdio_dev **cons_set;
 
        console_args = strdup(arg);
        if (console_args == NULL)
@@ -128,10 +128,23 @@ int iomux_doenv(const int console, const char *arg)
                return 1;
        }
 
-       /* Works even if console_devices[console] is NULL. */
-       free(console_devices[console]);
+       old_set = console_devices[console];
+       repeat = cd_count[console];
+
        console_devices[console] = cons_set;
        cd_count[console] = cs_idx;
+
+       /* Stop dropped consoles */
+       for (i = 0; i < repeat; i++) {
+               for (j = 0; j < cs_idx; j++) {
+                       if (old_set[i] == cons_set[j])
+                               break;
+               }
+               if (j == cs_idx)
+                       console_stop(console, old_set[i]);
+       }
+
+       free(old_set);
        return 0;
 }
 #endif /* CONSOLE_MUX */