From efa59464e448b34a7a693ddfcd69037fe04f27cf Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 14 Sep 2012 06:53:23 +0000 Subject: [PATCH] --- yaml --- r: 325485 b: refs/heads/master c: 2b7c4b8e3edfd109a8423ff593a12a5fe09615b2 h: refs/heads/master i: 325483: bbdd42413960d10d17cb5722abc01d117ceddff7 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-sensor-hub.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2f82113499f4..0a834dca38ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f45c69b1136078bb35ee0f1cb89ae92fd9bc5cd0 +refs/heads/master: 2b7c4b8e3edfd109a8423ff593a12a5fe09615b2 diff --git a/trunk/drivers/hid/hid-sensor-hub.c b/trunk/drivers/hid/hid-sensor-hub.c index 4ac759c1fe22..0c93b10b0813 100644 --- a/trunk/drivers/hid/hid-sensor-hub.c +++ b/trunk/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;