| Message ID | 20191016001559.27947-1-lixu.zhang@intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | hid: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring() | expand |
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.
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; }