diff options
| author | Everest K.C. <everestkc@everestkc.com.np> | 2024-10-18 01:07:24 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-19 11:03:33 +0300 |
| commit | 039beaa5ace1e2cf9f0f3fa542f3057f9ededa61 (patch) | |
| tree | 5e7dfce5033d2059e4c3c101bfce92a85936dcf8 /drivers | |
| parent | 1f6bfe18d0fc1c4f22720ed163c85f692ea65c6a (diff) | |
| download | linux-039beaa5ace1e2cf9f0f3fa542f3057f9ededa61.tar.xz | |
staging: gpib: Change return type and error code of fmh_gpib_get_dma_residue()
fmh_gpib_get_dma_residue() returns unsigned int with -1 as error code.
This error cannot be caught.
Fix this by changing the return type of the function to int and
returning the error code, that was captured. Also, change the data
type of variable residue to int in the function fmh_gpib_dma_read().
Fixes: 8e4841a0888c ("staging: gpib: Add Frank Mori Hess FPGA PCI GPIB driver")
Reported-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Everest K.C. <everestkc@everestkc.com.np>
Link: https://lore.kernel.org/r/20241017220740.30370-1-everestkc@everestkc.com.np
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c index 9a081aae913a..73409b066727 100644 --- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c +++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c @@ -547,7 +547,7 @@ static int fmh_gpib_accel_write(gpib_board_t *board, uint8_t *buffer, return 0; } -static unsigned int fmh_gpib_get_dma_residue(struct dma_chan *chan, dma_cookie_t cookie) +static int fmh_gpib_get_dma_residue(struct dma_chan *chan, dma_cookie_t cookie) { struct dma_tx_state state; int result; @@ -555,7 +555,7 @@ static unsigned int fmh_gpib_get_dma_residue(struct dma_chan *chan, dma_cookie_t result = dmaengine_pause(chan); if (result < 0) { pr_err("fmh_gpib_gpib: dma pause failed?\n"); - return -1; + return result; } dmaengine_tx_status(chan, cookie, &state); // dma330 hardware doesn't support resume, so dont call this @@ -717,7 +717,7 @@ static int fmh_gpib_dma_read(gpib_board_t *board, uint8_t *buffer, struct nec7210_priv *nec_priv = &e_priv->nec7210_priv; int retval = 0; unsigned long flags; - unsigned int residue; + int residue; int wait_retval; dma_addr_t bus_address; struct dma_async_tx_descriptor *tx_desc; |