Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795055282; b=LgThgSSEfKuf1oFEqmcIAd7bxcS0FzniY7Y0wmHPJcDxLq9HQuTxz2BF96Eivj3z08ga fhD6KhU9aNXgYCgbt7vmhVoiIdHVrLVQLyjxj4EPzskVGV5r9ojB6qbRdufEBHvxMu4gP 46U8F6KXXAhA5FPQEhI0i/uRrWqvHivLhD5Mx8/TSFyDI1ZAj5JEcmR/DhEO4eLrvHQmY 2tt6oIBEPr5UuMNpsnyN18ShZp3/EMBMwp4XTqVeX4cTPs7g9HwF4YfQBh8mgcBXnyygu NCzUzVRCXtcGZr0+ABdKC//YXTdMutBaTVizhslgDi9OGC+YqaBm3ZoFyXvnGJmy8Rw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795055282; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=WWNuaUcPFovbgy7MdSO3yHbhppz+CVEQ2/pc7HzAkJ0=; b=XnS7pA+HtjpUUv/4osFHICSDKGxzgE0gNcBnV9bFZUKMKKOH9CSDf0IN+Bmt4knnFB2I aX5MOWYnx1gsgaZd08LbLqAXAZIqsm0kLNSn7HoaEDtn3yjG/gIR2MJvziMPZUPPB53P7 +kRQ7XXikvdkOxsMcrWOw0RMBHBYvggbITSdxx5co1vV9UfCb0fwMg8rqYAHOikdRA42H IN9ZNxBe3NMPmnBtUXc1hq7hnbogjZXDFBcZRbGZ4eMTYSi9wRf+TrKKZ0+pY1lt6oZYt cdLrnkMjTrmFzraY5d8MY+f503FK6ocplVGLrH+e6MviCLpbFOXDnECGSq/gvNbHFCQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=zIzQMVEU; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C60B606A32A; Thu, 19 Nov 2026 02:28:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=zIzQMVEU Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65FBA1F000C6; Thu, 19 Nov 2026 02:28:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795055282; bh=WWNuaUcPFovbgy7MdSO3yHbhppz+CVEQ2/pc7HzAkJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zIzQMVEUSpDS2ZxXv0rvCkjeoXQIfW0ZRHykiytOFU7CKQyLzzapOJsT4AI7etWJS i85wSXncmM7zgrcuwC6Ra0p2ylMKZDbA55Th/ly2TEVPgv8DFubxCrDJRiv1+K0C2/ lurs8fphKJLLp1j4q97jS3/21NseMfhg0No+/osU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Laurent Vivier , Finn Thain , Stan Johnson , Jens Axboe , Sasha Levin Subject: [PATCH 5.15 1575/2214] swim: Simplify return value initialization Date: Wed, 18 Nov 2026 15:54:11 +0100 Message-ID: <20261118150115.047476040@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Finn Thain [ Upstream commit 385a44e78702762e2fce796cf37b6f465d86a87f ] Initialize the error result once only. Update the result only after a successful read. Reviewed-by: Laurent Vivier Signed-off-by: Finn Thain Tested-by: Stan Johnson Link: https://patch.msgid.link/28322f0cbefd865bdfb679bab4352c111996795b.1788513997.git.fthain@linux-m68k.org Signed-off-by: Jens Axboe Stable-dep-of: d66bdef0a308 ("swim: Check error register during sector read") Signed-off-by: Sasha Levin --- drivers/block/swim_asm.S | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/block/swim_asm.S b/drivers/block/swim_asm.S index 250e408060e8b..81c824923336c 100644 --- a/drivers/block/swim_asm.S +++ b/drivers/block/swim_asm.S @@ -49,6 +49,7 @@ swim_read_sector_header: link %a6, #0 moveml %d1-%d5/%a0-%a4,%sp@- movel %a6@(0x0c), %a4 + moveq #-1, %d0 bsr mfm_read_addrmark moveml %sp@+, %d1-%d5/%a0-%a4 unlk %a6 @@ -63,7 +64,6 @@ mfm_read_addrmark: movel %a6@(0x08), %a3 lea %a3@(read_handshake), %a2 lea %a3@(read_mark), %a3 - moveq #-1, %d0 movew #seek_time, %d2 wait_header_init: @@ -143,10 +143,7 @@ crc1: tstb %a2@ tstb %a3@(read_error - read_mark) moveq #0, %d0 - moveb #0x18, %a3@(write_mode0 - read_mark) - rts signal_nonyb: - moveq #-1, %d0 moveb #0x18, %a3@(write_mode0 - read_mark) rts @@ -155,6 +152,7 @@ swim_read_sector_data: link %a6, #0 moveml %d1-%d5/%a0-%a5,%sp@- movel %a6@(0x0c), %a4 + moveq #-1, %d0 bsr mfm_read_data moveml %sp@+, %d1-%d5/%a0-%a5 unlk %a6 @@ -238,15 +236,12 @@ data_crc1: tstb %a3@(read_error - read_mark) - moveb #0x18, %a3@(write_mode0 - read_mark) - /* return number of bytes read */ movel #sector_size, %d0 addw #1, %d4 subl %d4, %d0 - rts + data_exit: moveb #0x18, %a3@(write_mode0 - read_mark) - moveq #-1, %d0 rts -- 2.53.0