From 57808606d86e68f9b8765cb34504d6d212aa57da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Mal=C3=BD?= <madcatxster@gmail.com>
Date: Sat, 31 Mar 2012 11:35:05 +0200
Subject: [PATCH] --- yaml --- r: 305039 b: refs/heads/master c:
 6a2e176b2d6ae6bb528c0c1a50a6332e176cda12 h: refs/heads/master i:   305037:
 f012cf2b68d0bc135232593c1c85e028ee2f1c18   305035:
 327661ecf7c37462e892b12139540f5daaabfcec   305031:
 a8460d8f3850137de487e799e59de6c1735f72e5   305023:
 d1be63d51caf17706701f0b6e0b12136e658fbec v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/hid/hid-lg.h    | 2 --
 trunk/drivers/hid/hid-lg4ff.c | 6 ++++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 07f125dc3cd2..b0aed7062d85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8577dbf9d6eb07213caefb49e2017c177c5f023d
+refs/heads/master: 6a2e176b2d6ae6bb528c0c1a50a6332e176cda12
diff --git a/trunk/drivers/hid/hid-lg.h b/trunk/drivers/hid/hid-lg.h
index 500457b67b21..d64cf8d2751e 100644
--- a/trunk/drivers/hid/hid-lg.h
+++ b/trunk/drivers/hid/hid-lg.h
@@ -1,8 +1,6 @@
 #ifndef __HID_LG_H
 #define __HID_LG_H
 
-#include <linux/spinlock.h>
-
 struct lg_drv_data {
 	unsigned long quirks;
 	void *device_props;	/* Device specific properties */
diff --git a/trunk/drivers/hid/hid-lg4ff.c b/trunk/drivers/hid/hid-lg4ff.c
index 6ecc9e220440..11452920a6c3 100644
--- a/trunk/drivers/hid/hid-lg4ff.c
+++ b/trunk/drivers/hid/hid-lg4ff.c
@@ -466,6 +466,9 @@ int lg4ff_deinit(struct hid_device *hid)
 	bool found = 0;
 	struct lg4ff_device_entry *entry;
 	struct list_head *h, *g;
+	
+	device_remove_file(&hid->dev, &dev_attr_range);
+
 	list_for_each_safe(h, g, &device_list.list) {
 		entry = list_entry(h, struct lg4ff_device_entry, list);
 		if (strcmp(entry->device_id, (&hid->dev)->kobj.name) == 0) {
@@ -478,11 +481,10 @@ int lg4ff_deinit(struct hid_device *hid)
 	}
 
 	if (!found) {
-		dbg_hid("Device entry not found!\n");
+		hid_err(hid, "Device entry not found!\n");
 		return -1;
 	}
 
-	device_remove_file(&hid->dev, &dev_attr_range);
 	dbg_hid("Device successfully unregistered\n");
 	return 0;
 }