From: Dan Carpenter Date: Fri, 14 Sep 2012 06:53:23 +0000 (+0000) Subject: HID: sensors: use GFP_ATOMIC under spinlock X-Git-Tag: upstream/snapshot3+hdmi~6593^2~50^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b7c4b8e3edfd109a8423ff593a12a5fe09615b2;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: Jiri Kosina Signed-off-by: Jonathan Cameron --- diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index 4ac759c..0c93b10 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -173,7 +173,7 @@ int sensor_hub_register_callback(struct hid_sensor_hub_device *hsdev, spin_unlock(&pdata->dyn_callback_lock); return -EINVAL; } - callback = kzalloc(sizeof(*callback), GFP_KERNEL); + callback = kzalloc(sizeof(*callback), GFP_ATOMIC); if (!callback) { spin_unlock(&pdata->dyn_callback_lock); 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 == report->field[i]->usage->hid) { 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) { memcpy(pdata->pending.raw_data, ptr, sz); pdata->pending.raw_size = sz;