mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-22 03:00:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

staging: gpib: Correct check for max secondary address

Browse Source 
GPIB secondary addresses can be between 0 and 31 inclusive
unlike primary addresses where address 31 is not a valid device
address.  When 31 is used as a primary talk address it
forms the UNT (Untalk) command and when used as a listener address it
forms the UNL (Unlisten) commmand.
The library was incorrectly not allowing a secondary address
with a value of 31 to be used.

Fixes: 9dde4559e9 ("staging: gpib: Add GPIB common core driver")
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/20241104175014.12317-13-dpenkler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dave Penkler
2024-11-04 18:50:13 +01:00
committed by Greg Kroah-Hartman
parent 3c2ae0cbaf
commit 7c8a7d2f88
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/gpib/common/gpib_os.c
View File

@@ -525,8 +525,6 @@ int serial_poll_all(gpib_board_t *board, unsigned int usec_timeout)
* SPD and UNT are sent at the completion of the poll.
*/
static const int gpib_addr_max = 30; /* max address for primary/secondary gpib addresses */
int dvrsp(gpib_board_t *board, unsigned int pad, int sad,
unsigned int usec_timeout, uint8_t *result)
{
@@ -538,7 +536,7 @@ int dvrsp(gpib_board_t *board, unsigned int pad, int sad,
return -1;
}
if (pad > gpib_addr_max || sad > gpib_addr_max) {
if (pad > MAX_GPIB_PRIMARY_ADDRESS || sad > MAX_GPIB_SECONDARY_ADDRESS) {
pr_err("gpib: bad address for serial poll");
return -1;
}

6
drivers/staging/gpib/common/iblib.c
View File

@@ -479,7 +479,7 @@ int ibsre(gpib_board_t *board, int enable)
*/
int ibpad(gpib_board_t *board, unsigned int addr)
{
if (addr > 30) {
if (addr > MAX_GPIB_PRIMARY_ADDRESS) {
pr_err("gpib: invalid primary address %u\n", addr);
return -1;
}
@@ -498,8 +498,8 @@ int ibpad(gpib_board_t *board, unsigned int addr)
*/
int ibsad(gpib_board_t *board, int addr)
{
if (addr > 30) {
pr_err("gpib: invalid secondary address %i, must be 0-30\n", addr);
if (addr > MAX_GPIB_SECONDARY_ADDRESS) {
pr_err("gpib: invalid secondary address %i\n", addr);
return -1;
}
board->sad = addr;

3
drivers/staging/gpib/common/ibsys.h
View File

@@ -16,6 +16,9 @@
#include <asm/irq.h>
#include <asm/dma.h>
#define MAX_GPIB_PRIMARY_ADDRESS 30
#define MAX_GPIB_SECONDARY_ADDRESS 31
int gpib_allocate_board(gpib_board_t *board);
void gpib_deallocate_board(gpib_board_t *board);