HID: sensors: use GFP_ATOMIC under spinlock

We're holding a spinlock here so we can't call kmalloc() with
GFP_KERNEL.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Dan Carpenter 2012-09-14 06:53:23 +00:00 коммит произвёл Jonathan Cameron
Родитель f45c69b113
Коммит 2b7c4b8e3e
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -173,7 +173,7 @@ int sensor_hub_register_callback(struct hid_sensor_hub_device *hsdev,
spin_unlock(&pdata->dyn_callback_lock); spin_unlock(&pdata->dyn_callback_lock);
return -EINVAL; return -EINVAL;
} }
callback = kzalloc(sizeof(*callback), GFP_KERNEL); callback = kzalloc(sizeof(*callback), GFP_ATOMIC);
if (!callback) { if (!callback) {
spin_unlock(&pdata->dyn_callback_lock); spin_unlock(&pdata->dyn_callback_lock);
return -ENOMEM; return -ENOMEM;
@ -462,7 +462,7 @@ static int sensor_hub_raw_event(struct hid_device *hdev,
if (pdata->pending.status && pdata->pending.attr_usage_id == if (pdata->pending.status && pdata->pending.attr_usage_id ==
report->field[i]->usage->hid) { report->field[i]->usage->hid) {
hid_dbg(hdev, "data was pending ...\n"); hid_dbg(hdev, "data was pending ...\n");
pdata->pending.raw_data = kmalloc(sz, GFP_KERNEL); pdata->pending.raw_data = kmalloc(sz, GFP_ATOMIC);
if (pdata->pending.raw_data) { if (pdata->pending.raw_data) {
memcpy(pdata->pending.raw_data, ptr, sz); memcpy(pdata->pending.raw_data, ptr, sz);
pdata->pending.raw_size = sz; pdata->pending.raw_size = sz;