summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFinn Thain <fthain@linux-m68k.org>2025-04-24 10:07:26 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-19 15:39:32 +0200
commitde3ef06c553902d27d2916d86553ef7d551e46b0 (patch)
tree2c1e28246c914582934a4206e461b96690bdd6e4
parent599facc46884ac876f8cd65aababd669f45ac876 (diff)
m68k: mac: Fix macintosh_config for Mac II
[ Upstream commit 52ae3f5da7e5adbe3d1319573b55dac470abb83c ] When booted on my Mac II, the kernel prints this: Detected Macintosh model: 6 Apple Macintosh Unknown The catch-all entry ("Unknown") is mac_data_table[0] which is only needed in the unlikely event that the bootinfo model ID can't be matched. When model ID is 6, the search should begin and end at mac_data_table[1]. Fix the off-by-one error that causes this problem. Cc: Joshua Thompson <funaho@jurai.org> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Finn Thain <fthain@linux-m68k.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/d0f30a551064ca4810b1c48d5a90954be80634a9.1745453246.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--arch/m68k/mac/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index e324410ef239..d26c7f4f8c36 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -793,7 +793,7 @@ static void __init mac_identify(void)
}
macintosh_config = mac_data_table;
- for (m = macintosh_config; m->ident != -1; m++) {
+ for (m = &mac_data_table[1]; m->ident != -1; m++) {
if (m->ident == model) {
macintosh_config = m;
break;