From: Axel Lin <axel.lin@gmail.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: srinivas pandruvada <srinivas.pandruvada@intel.com>,
Jonathan Cameron <jic23@kernel.org>,
linux-input@vger.kernel.org
Subject: [PATCH 2/3] HID: hid-sensor-hub: Fix sensor_hub_probe error handling
Date: Fri, 14 Sep 2012 06:05:12 +0800 [thread overview]
Message-ID: <1347573912.8974.4.camel@phoenix> (raw)
In-Reply-To: <1347573801.8974.2.camel@phoenix>
Fix below issues in sensor_hub_probe error handling:
1. In the case of goto err_close, hid_hw_stop(hdev) is called twice. Fix it.
2. If fails to allocate MFD device name, we also need to free all
sucessfully allocated names in previous iterations.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/hid/hid-sensor-hub.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 1faacf2..f9d6209 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -580,7 +580,7 @@ static int sensor_hub_probe(struct hid_device *hdev,
hid_err(hdev,
"Failed MFD device name\n");
ret = -ENOMEM;
- goto err_free_cells;
+ goto err_free_names;
}
sd->hid_sensor_hub_client_devs[
sd->hid_sensor_client_cnt].name = name;
@@ -604,10 +604,8 @@ static int sensor_hub_probe(struct hid_device *hdev,
err_free_names:
for (i = 0; i < sd->hid_sensor_client_cnt ; ++i)
kfree(sd->hid_sensor_hub_client_devs[i].name);
-err_free_cells:
kfree(sd->hid_sensor_hub_client_devs);
err_close:
- hid_hw_stop(hdev);
hid_hw_close(hdev);
err_stop_hw:
hid_hw_stop(hdev);
--
1.7.9.5
next prev parent reply other threads:[~2012-09-13 22:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-13 22:03 [PATCH 1/3] HID: hid-sensor-hub: Remove setting hdev->claimed before calling hid_hw_start() Axel Lin
2012-09-13 22:05 ` Axel Lin [this message]
2012-09-13 22:06 ` [PATCH 3/3] HID: hid-sensor-hub: Call hid_hw_close() before hid_hw_stop() Axel Lin
2012-09-13 22:31 ` Pandruvada, Srinivas
2012-09-17 10:58 ` Jiri Kosina
2012-09-17 15:20 ` Pandruvada, Srinivas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347573912.8974.4.camel@phoenix \
--to=axel.lin@gmail.com \
--cc=jic23@kernel.org \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=srinivas.pandruvada@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.