| From 0f0ff6a030328fbda67f8b0dde67d23408684162 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 22 Nov 2018 08:52:33 +0800 |
| Subject: HID: intel-ish-hid: fixes incorrect error handling |
| |
| From: Pan Bian <bianpan2016@163.com> |
| |
| [ Upstream commit 6e0856d317440a950b17c00a9283114f025e5699 ] |
| |
| The memory chunk allocated by hid_allocate_device() should be released |
| by hid_destroy_device(), not kfree(). |
| |
| Fixes: 0b28cb4bcb1("HID: intel-ish-hid: ISH HID client driver") |
| Signed-off-by: Pan Bian <bianpan2016@163.com> |
| Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.c b/drivers/hid/intel-ish-hid/ishtp-hid.c |
| index 277983aa1d90a..d0b902285fc3a 100644 |
| --- a/drivers/hid/intel-ish-hid/ishtp-hid.c |
| +++ b/drivers/hid/intel-ish-hid/ishtp-hid.c |
| @@ -222,7 +222,7 @@ int ishtp_hid_probe(unsigned int cur_hid_dev, |
| err_hid_device: |
| kfree(hid_data); |
| err_hid_data: |
| - kfree(hid); |
| + hid_destroy_device(hid); |
| return rv; |
| } |
| |
| -- |
| 2.20.1 |
| |