]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
m68k: amiga: Fix Denise detection on OCS
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 12 Jan 2020 17:17:05 +0000 (18:17 +0100)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Wed, 26 Aug 2020 11:26:52 +0000 (13:26 +0200)
The "default" statement for detecting an original Denise chip seems to
be misplaced, causing original Denise chips not being detected.

Fix this by moving it from the outer to the inner "switch" statement.

Fortunately no code relies on this, but the detected version is printed
during boot, and available through /proc/hardware.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20200112171705.22600-1-geert@linux-m68k.org
arch/m68k/amiga/config.c

index 8f23b2fab64c7aec893721f2d59eda869860f42b..9c1afa143d05962b24e5a1bcf90b91ddb3849a2b 100644 (file)
@@ -278,11 +278,11 @@ static void __init amiga_identify(void)
                        case 0x08:
                                AMIGAHW_SET(LISA);
                                break;
+                       default:
+                               AMIGAHW_SET(DENISE);
+                               break;
                        }
                        break;
-               default:
-                       AMIGAHW_SET(DENISE);
-                       break;
                }
                switch ((amiga_custom.vposr>>8) & 0x7f) {
                case 0x00: