diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-05-17 03:25:08 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-05-17 03:25:08 +0300 |
| commit | 23ea5967d6bd30ed59480edbc5fe21eec81682a3 (patch) | |
| tree | 345bf01823cf76596bc05e83fab9bf21678fef90 /drivers/input/misc/twl6040-vibra.c | |
| parent | c52c545ead97fcc2f4f8ea38f1ae3c23211e09a8 (diff) | |
| parent | d96caf8c33cad42b5eabcf1b686dd91581e306f4 (diff) | |
| download | linux-23ea5967d6bd30ed59480edbc5fe21eec81682a3.tar.xz | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.7 merge window.
Diffstat (limited to 'drivers/input/misc/twl6040-vibra.c')
| -rw-r--r-- | drivers/input/misc/twl6040-vibra.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c index 42de34b92996..5690eb7ff954 100644 --- a/drivers/input/misc/twl6040-vibra.c +++ b/drivers/input/misc/twl6040-vibra.c @@ -46,7 +46,7 @@ struct vibra_info { struct device *dev; struct input_dev *input_dev; struct work_struct play_work; - struct mutex mutex; + int irq; bool enabled; @@ -190,8 +190,6 @@ static void vibra_play_work(struct work_struct *work) return; } - mutex_lock(&info->mutex); - if (info->weak_speed || info->strong_speed) { if (!info->enabled) twl6040_vibra_enable(info); @@ -200,7 +198,6 @@ static void vibra_play_work(struct work_struct *work) } else if (info->enabled) twl6040_vibra_disable(info); - mutex_unlock(&info->mutex); } static int vibra_play(struct input_dev *input, void *data, @@ -223,12 +220,8 @@ static void twl6040_vibra_close(struct input_dev *input) cancel_work_sync(&info->play_work); - mutex_lock(&info->mutex); - if (info->enabled) twl6040_vibra_disable(info); - - mutex_unlock(&info->mutex); } static int __maybe_unused twl6040_vibra_suspend(struct device *dev) @@ -236,13 +229,11 @@ static int __maybe_unused twl6040_vibra_suspend(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct vibra_info *info = platform_get_drvdata(pdev); - mutex_lock(&info->mutex); + cancel_work_sync(&info->play_work); if (info->enabled) twl6040_vibra_disable(info); - mutex_unlock(&info->mutex); - return 0; } @@ -301,8 +292,6 @@ static int twl6040_vibra_probe(struct platform_device *pdev) return -EINVAL; } - mutex_init(&info->mutex); - error = devm_request_threaded_irq(&pdev->dev, info->irq, NULL, twl6040_vib_irq_handler, IRQF_ONESHOT, |