From 7aa9e09e540bb44c18932f5b65c046977a3ec79b Mon Sep 17 00:00:00 2001
From: Axel Lin <[mailto:axel.lin@gmail.com]>
Date: Wed, 19 Sep 2012 16:30:00 +0100
Subject: [PATCH] --- yaml --- r: 325503 b: refs/heads/master c:
 f2f13a68c37c13a7147b279b77b8fb2a36846059 h: refs/heads/master i:   325501:
 71aa799556328f4bbc84d9881fc26e33dd6b4480   325499:
 f351bcae8c97ac037cbdde8da7783b4d0c8975cd   325495:
 f06d4bb60b4344a7cc61ec1874f854b5e148fac2   325487:
 4f49860da7591448d7844598304414798c41dc4e   325471:
 ae67860a6f038b0d1bc23999d7035945c845cfe5   325439:
 60d2a53dec5ba93886dcc63e93b2ecc5ba2edba7   325375:
 eaca102308de1c3c6db6a2d9f4e40bb8b7542555 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/hid/hid-sensor-hub.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index cb4b53ead439..b90b23c05aa2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f257caf2d18fb45ab8d0fbaf71812d2b403cd0d
+refs/heads/master: f2f13a68c37c13a7147b279b77b8fb2a36846059
diff --git a/trunk/drivers/hid/hid-sensor-hub.c b/trunk/drivers/hid/hid-sensor-hub.c
index 0e0fad0285ab..d9d73e9163eb 100644
--- a/trunk/drivers/hid/hid-sensor-hub.c
+++ b/trunk/drivers/hid/hid-sensor-hub.c
@@ -555,8 +555,7 @@ static int sensor_hub_probe(struct hid_device *hdev,
 						sizeof(struct mfd_cell),
 						GFP_KERNEL);
 	if (sd->hid_sensor_hub_client_devs == NULL) {
-		hid_err(hdev,
-			"Failed to allocate memory for mfd cells\n");
+		hid_err(hdev, "Failed to allocate memory for mfd cells\n");
 			ret = -ENOMEM;
 			goto err_close;
 	}
@@ -568,10 +567,9 @@ static int sensor_hub_probe(struct hid_device *hdev,
 			name = kasprintf(GFP_KERNEL, "HID-SENSOR-%x",
 						field->physical);
 			if (name  == NULL) {
-				hid_err(hdev,
-					"Failed MFD device name\n");
+				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;
@@ -595,10 +593,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);
@@ -617,8 +613,8 @@ static void sensor_hub_remove(struct hid_device *hdev)
 	int i;
 
 	hid_dbg(hdev, " hardware removed\n");
-	hid_hw_stop(hdev);
 	hid_hw_close(hdev);
+	hid_hw_stop(hdev);
 	spin_lock_irqsave(&data->lock, flags);
 	if (data->pending.status)
 		complete(&data->pending.ready);