diff options
| -rw-r--r-- | drivers/input/misc/adxl34x.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c index bb9c10f9dfd3..e2ca01708080 100644 --- a/drivers/input/misc/adxl34x.c +++ b/drivers/input/misc/adxl34x.c | |||
| @@ -432,11 +432,10 @@ void adxl34x_resume(struct adxl34x *ac) | |||
| 432 | if (ac->suspended && !ac->disabled && ac->opened) | 432 | if (ac->suspended && !ac->disabled && ac->opened) |
| 433 | __adxl34x_enable(ac); | 433 | __adxl34x_enable(ac); |
| 434 | 434 | ||
| 435 | ac->suspended= false; | 435 | ac->suspended = false; |
| 436 | 436 | ||
| 437 | mutex_unlock(&ac->mutex); | 437 | mutex_unlock(&ac->mutex); |
| 438 | } | 438 | } |
| 439 | |||
| 440 | EXPORT_SYMBOL_GPL(adxl34x_resume); | 439 | EXPORT_SYMBOL_GPL(adxl34x_resume); |
| 441 | 440 | ||
| 442 | static ssize_t adxl34x_disable_show(struct device *dev, | 441 | static ssize_t adxl34x_disable_show(struct device *dev, |
| @@ -709,7 +708,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq, | |||
| 709 | input_dev = input_allocate_device(); | 708 | input_dev = input_allocate_device(); |
| 710 | if (!ac || !input_dev) { | 709 | if (!ac || !input_dev) { |
| 711 | err = -ENOMEM; | 710 | err = -ENOMEM; |
| 712 | goto err_out; | 711 | goto err_free_mem; |
| 713 | } | 712 | } |
| 714 | 713 | ||
| 715 | ac->fifo_delay = fifo_delay_default; | 714 | ac->fifo_delay = fifo_delay_default; |
| @@ -904,9 +903,9 @@ int adxl34x_remove(struct adxl34x *ac) | |||
| 904 | sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group); | 903 | sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group); |
| 905 | free_irq(ac->irq, ac); | 904 | free_irq(ac->irq, ac); |
| 906 | input_unregister_device(ac->input); | 905 | input_unregister_device(ac->input); |
| 906 | dev_dbg(ac->dev, "unregistered accelerometer\n"); | ||
| 907 | kfree(ac); | 907 | kfree(ac); |
| 908 | 908 | ||
| 909 | dev_dbg(ac->dev, "unregistered accelerometer\n"); | ||
| 910 | return 0; | 909 | return 0; |
| 911 | } | 910 | } |
| 912 | EXPORT_SYMBOL_GPL(adxl34x_remove); | 911 | EXPORT_SYMBOL_GPL(adxl34x_remove); |
