Skip to contentSkip to conversation

scsi: ppa: Fix accidentally reversed conditions for 16-bit and 32-bit EPP

PATCH Applied Alex Henrie 2 participants 3 messages Aug 31, 2023 – Sep 14, 2023 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: ppa: Fix accidentally reversed conditions for 16-bit and 32-bit EPP

The conditions were correct in the ppa_in function but not in the ppa_out function.

Fixes 68a4f84a17c1 ("scsi: ppa: Add a module parameter for the transfer mode")
---
 drivers/scsi/ppa.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/ppa.c +2 -2
index 19f0b93fa3d8..d592ee9170c1 100644
@@ -307,9 +307,9 @@ static int ppa_out(ppa_struct *dev, char *buffer, int len)
 	case PPA_EPP_8:
 		epp_reset(ppb);
 		w_ctr(ppb, 0x4);
-		if (dev->mode == PPA_EPP_32 && !(((long) buffer | len) & 0x01))
+		if (dev->mode == PPA_EPP_32 && !(((long) buffer | len) & 0x03))
 			outsl(ppb + 4, buffer, len >> 2);
-		else if (dev->mode == PPA_EPP_16 && !(((long) buffer | len) & 0x03))
+		else if (dev->mode == PPA_EPP_16 && !(((long) buffer | len) & 0x01))
 			outsw(ppb + 4, buffer, len >> 1);
 		else
 			outsb(ppb + 4, buffer, len);
Signature · 1 line
2.42.0
#1 lore raw

Alex,

Quoted 2 lines

The conditions were correct in the ppa_in function but not in the ppa_out function.

Applied to 6.6/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering