Use the return value of tnt4882_allocate_private in calling code as
early return value in case of error.
Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
v3:
- Split commit into smaller pieces
- Improve changelog
- Change `(retval < 0)` to `(retval)`
drivers/gpib/tnt4882/tnt4882_gpib.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/gpib/tnt4882/tnt4882_gpib.c b/drivers/gpib/tnt4882/tnt4882_gpib.c
index 7b9cfb6c07ad..6d241509419e 100644
--- a/drivers/gpib/tnt4882/tnt4882_gpib.c
+++ b/drivers/gpib/tnt4882/tnt4882_gpib.c
@@ -915,8 +915,9 @@ static int ni_pci_attach(struct gpib_board *board, const struct gpib_board_confi
board->status = 0;
- if (tnt4882_allocate_private(board))
- return -ENOMEM;
+ retval = tnt4882_allocate_private(board);
+ if (retval)
+ return retval;
tnt_priv = board->private_data;
nec_priv = &tnt_priv->nec7210_priv;
nec_priv->type = TNT4882;
@@ -1038,8 +1039,9 @@ static int ni_isa_attach_common(struct gpib_board *board, const struct gpib_boar
board->status = 0;
- if (tnt4882_allocate_private(board))
- return -ENOMEM;
+ retval = tnt4882_allocate_private(board);
+ if (retval)
+ return retval;
tnt_priv = board->private_data;
nec_priv = &tnt_priv->nec7210_priv;
nec_priv->type = chipset;
@@ -1724,8 +1726,9 @@ static int ni_pcmcia_attach(struct gpib_board *board, const struct gpib_board_co
board->status = 0;
- if (tnt4882_allocate_private(board))
- return -ENOMEM;
+ retval = tnt4882_allocate_private(board);
+ if (retval)
+ return retval;
tnt_priv = board->private_data;
nec_priv = &tnt_priv->nec7210_priv;
--
2.43.0