linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] hid: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring()
@ 2019-10-16  0:15 Zhang Lixu
  2019-10-16  6:27 ` Jiri Kosina
  0 siblings, 1 reply; 2+ messages in thread
From: Zhang Lixu @ 2019-10-16  0:15 UTC (permalink / raw)
  To: jikos, linux-input
  Cc: linux-kernel, srinivas.pandruvada, benjamin.tissoires, Zhang Lixu

When allocating tx ring buffers failed, should free tx buffers, not rx buffers.

Signed-off-by: Zhang Lixu <lixu.zhang@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
 drivers/hid/intel-ish-hid/ishtp/client-buffers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/intel-ish-hid/ishtp/client-buffers.c b/drivers/hid/intel-ish-hid/ishtp/client-buffers.c
index 1b0a0cc605e7..513d7a4a1b8a 100644
--- a/drivers/hid/intel-ish-hid/ishtp/client-buffers.c
+++ b/drivers/hid/intel-ish-hid/ishtp/client-buffers.c
@@ -84,7 +84,7 @@ int ishtp_cl_alloc_tx_ring(struct ishtp_cl *cl)
 	return	0;
 out:
 	dev_err(&cl->device->dev, "error in allocating Tx pool\n");
-	ishtp_cl_free_rx_ring(cl);
+	ishtp_cl_free_tx_ring(cl);
 	return	-ENOMEM;
 }
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] hid: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring()
  2019-10-16  0:15 [PATCH] hid: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring() Zhang Lixu
@ 2019-10-16  6:27 ` Jiri Kosina
  0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2019-10-16  6:27 UTC (permalink / raw)
  To: Zhang Lixu
  Cc: linux-input, linux-kernel, srinivas.pandruvada, benjamin.tissoires

On Wed, 16 Oct 2019, Zhang Lixu wrote:

> When allocating tx ring buffers failed, should free tx buffers, not rx buffers.
> 
> Signed-off-by: Zhang Lixu <lixu.zhang@intel.com>
> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
>  drivers/hid/intel-ish-hid/ishtp/client-buffers.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/hid/intel-ish-hid/ishtp/client-buffers.c b/drivers/hid/intel-ish-hid/ishtp/client-buffers.c
> index 1b0a0cc605e7..513d7a4a1b8a 100644
> --- a/drivers/hid/intel-ish-hid/ishtp/client-buffers.c
> +++ b/drivers/hid/intel-ish-hid/ishtp/client-buffers.c
> @@ -84,7 +84,7 @@ int ishtp_cl_alloc_tx_ring(struct ishtp_cl *cl)
>  	return	0;
>  out:
>  	dev_err(&cl->device->dev, "error in allocating Tx pool\n");
> -	ishtp_cl_free_rx_ring(cl);
> +	ishtp_cl_free_tx_ring(cl);

Applied to for-5.4/upstream-fixes, thanks.

-- 
Jiri Kosina
SUSE Labs


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-10-16  6:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-16  0:15 [PATCH] hid: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring() Zhang Lixu
2019-10-16  6:27 ` Jiri Kosina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).