From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71E9B293443; Tue, 17 Jun 2025 15:33:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750174411; cv=none; b=cZamIsjDfj7mIyhWIgLWR3MJHtO7sjAtWlQK/vsY/7AB4mc82OCKRbeCdHFWYBtOQw/sKQzO/D647cE9YxJrcXI/A4ZI2uv8uapxpFZoZzwZRA4o61BlsFpdMzQqhqqd2bB7dWuOFNTNstOBshCT+mRb9f8Y2NGstiFatfa0i7Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750174411; c=relaxed/simple; bh=au4zXKKfdEgKepJ/qFsk8ZY87A6Fo6DKtdTXH77hOVM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L1L4jWfe21IWstRTUXuqr5GbtMA0gShljoAyCb2mvp7LPyn/U5RbtFpkQUBK2ca4crZZsuMFo4dU3WiEkbPL/HWJA3KQwYYAvtG0qg3n8Q7ZYSiwBrexVGyb4OZYoypikYBFPFzlgSxrtqmk3Nrh9p2j0j54tLokAJR3pml8ruM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Aw/F4max; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Aw/F4max" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73663C4CEE3; Tue, 17 Jun 2025 15:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750174410; bh=au4zXKKfdEgKepJ/qFsk8ZY87A6Fo6DKtdTXH77hOVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Aw/F4maxbAEkgiDnpCx+Qugg2nmVcKfp8WC0cgcxGm1Hu+WvtKE6KrZw+qA5NCrPN PnaQPeQAqWA3MPBpme1+I9PYGoaPh1YquTALhQSQg/EcjPxWmT9D7h4qgKE34H0GsV oFauU7BpsRa2+u0eW7YtlHdl5CsBWWphnAHwG7qs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joshua Thompson , Finn Thain , Geert Uytterhoeven , Sasha Levin Subject: [PATCH 6.6 065/356] m68k: mac: Fix macintosh_config for Mac II Date: Tue, 17 Jun 2025 17:23:00 +0200 Message-ID: <20250617152340.847317535@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152338.212798615@linuxfoundation.org> References: <20250617152338.212798615@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Finn Thain [ 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 Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Finn Thain Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/d0f30a551064ca4810b1c48d5a90954be80634a9.1745453246.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven Signed-off-by: Sasha Levin --- arch/m68k/mac/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 382f656c29eae..9f5603e01a688 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -801,7 +801,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; -- 2.39.5