From 156d7af13a645ac98f1daea86646486f5492b215 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Thu, 22 Jul 2010 23:38:45 -0700
Subject: [PATCH] --- yaml --- r: 202223 b: refs/heads/master c:
 f1cba532e8c1001a39650379aa7e04ad974d0592 h: refs/heads/master i:   202221:
 487cd85692b297ad1d4379385a0c61a7bb89f6ac   202219:
 ba166015f7d6e5c3892f501de10f0f1e0b0c83cf   202215:
 b128683b25e1cb18a2f91aec2f674625fa9180b8   202207:
 93ea7ff10acede55a39649f1d47bba5699b1a7df v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/input/misc/adxl34x.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6f382dbeb019..50bf32c2dc66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fffed27f92d9d7a34de9fe017b7082b5958bb93
+refs/heads/master: f1cba532e8c1001a39650379aa7e04ad974d0592
diff --git a/trunk/drivers/input/misc/adxl34x.c b/trunk/drivers/input/misc/adxl34x.c
index bb9c10f9dfd3..e2ca01708080 100644
--- a/trunk/drivers/input/misc/adxl34x.c
+++ b/trunk/drivers/input/misc/adxl34x.c
@@ -432,11 +432,10 @@ void adxl34x_resume(struct adxl34x *ac)
 	if (ac->suspended && !ac->disabled && ac->opened)
 		__adxl34x_enable(ac);
 
-	ac->suspended= false;
+	ac->suspended = false;
 
 	mutex_unlock(&ac->mutex);
 }
-
 EXPORT_SYMBOL_GPL(adxl34x_resume);
 
 static ssize_t adxl34x_disable_show(struct device *dev,
@@ -709,7 +708,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,
 	input_dev = input_allocate_device();
 	if (!ac || !input_dev) {
 		err = -ENOMEM;
-		goto err_out;
+		goto err_free_mem;
 	}
 
 	ac->fifo_delay = fifo_delay_default;
@@ -904,9 +903,9 @@ int adxl34x_remove(struct adxl34x *ac)
 	sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group);
 	free_irq(ac->irq, ac);
 	input_unregister_device(ac->input);
+	dev_dbg(ac->dev, "unregistered accelerometer\n");
 	kfree(ac);
 
-	dev_dbg(ac->dev, "unregistered accelerometer\n");
 	return 0;
 }
 EXPORT_SYMBOL_GPL(adxl34x_remove);