---

yaml
---
r: 202223
b: refs/heads/master
c: f1cba53
h: refs/heads/master
i:
  202221: 487cd85
  202219: ba16601
  202215: b128683
  202207: 93ea7ff
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fffed27f92d9d7a34de9fe017b7082b5958bb93
+refs/heads/master: f1cba532e8c1001a39650379aa7e04ad974d0592

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);