diff options
| author | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2015-01-07 10:14:44 -0800 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-02-17 13:34:45 +0100 |
| commit | ed1197709504c3641cbad32843667539cc912ea1 (patch) | |
| tree | 7aef0f483fee97ddfbcaf98c58f212e6a0d83722 /drivers/hid/hid-sensor-hub.c | |
| parent | f9d904acb3e7e9edb470cd824fe2a21bb0df86b8 (diff) | |
| download | linux-ed1197709504c3641cbad32843667539cc912ea1.tar.gz linux-ed1197709504c3641cbad32843667539cc912ea1.tar.bz2 linux-ed1197709504c3641cbad32843667539cc912ea1.zip | |
HID: sensor-hub: correct dyn_callback_lock IRQ-safe change
Commit 0ccf091d1fbc1f99bb7f93bff8cf346769a9b0cd ("HID: sensor-hub:
make dyn_callback_lock IRQ-safe) was supposed to change locks
in sensor_hub_get_callback(), but missed.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-sensor-hub.c')
| -rw-r--r-- | drivers/hid/hid-sensor-hub.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index 6a58b6c723aa..e54ce1097e2c 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -135,8 +135,9 @@ static struct hid_sensor_hub_callbacks *sensor_hub_get_callback( { struct hid_sensor_hub_callbacks_list *callback; struct sensor_hub_data *pdata = hid_get_drvdata(hdev); + unsigned long flags; - spin_lock(&pdata->dyn_callback_lock); + spin_lock_irqsave(&pdata->dyn_callback_lock, flags); list_for_each_entry(callback, &pdata->dyn_callback_list, list) if (callback->usage_id == usage_id && (collection_index >= @@ -145,10 +146,11 @@ static struct hid_sensor_hub_callbacks *sensor_hub_get_callback( callback->hsdev->end_collection_index)) { *priv = callback->priv; *hsdev = callback->hsdev; - spin_unlock(&pdata->dyn_callback_lock); + spin_unlock_irqrestore(&pdata->dyn_callback_lock, + flags); return callback->usage_callback; } - spin_unlock(&pdata->dyn_callback_lock); + spin_unlock_irqrestore(&pdata->dyn_callback_lock, flags); return NULL; } |