staging: gpib: Fix secondary address restriction

dpenkler · gregkh · commit 5aac95320d0f · 2025-05-21T13:45:00.000+02:00
GPIB secondary addresses have valid values between 0 and 31 inclusive. The Make Secondary Address function MSA, used to form the protocol byte, was using the gpib_address_restrict function erroneously restricting the address range to 0 through 30. Remove the call to gpib_address_restrict and simply trim the address to 5 bits. Fixes: 2da03e7 ("staging: gpib: Add user api include files") Signed-off-by: Dave Penkler <dpenkler@gmail.com> Link: https://lore.kernel.org/r/20250520155100.5808-1-dpenkler@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/staging/gpib/uapi/gpib.h b/drivers/staging/gpib/uapi/gpib.h
@@ -136,7 +136,7 @@ static inline __u8 MTA(unsigned int addr)
 
 static inline __u8 MSA(unsigned int addr)
 {
-	return gpib_address_restrict(addr) | SAD;
+	return (addr & 0x1f) | SAD;
 }
 
 static inline __u8 PPE_byte(unsigned int dio_line, int sense)

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ static inline __u8 MTA(unsigned int addr)`
`136`	`136`
`137`	`137`	`static inline __u8 MSA(unsigned int addr)`
`138`	`138`	`{`
`139`		`- return gpib_address_restrict(addr) \| SAD;`
	`139`	`+ return (addr & 0x1f) \| SAD;`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`static inline __u8 PPE_byte(unsigned int dio_line, int sense)`