summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-stantum.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-18 23:38:50 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-18 23:38:50 -0700
commit97eb3f24352ec6632c2127b35d8087d2a809a9b9 (patch)
tree722948059bbd325bbca232269490124231df80d4 /drivers/hid/hid-stantum.c
parent439581ec07fa9cf3f519dd461a2cf41cfd3adcb4 (diff)
parentdef179c271ac9b5020deca798470521f14d11edd (diff)
downloadop-kernel-dev-97eb3f24352ec6632c2127b35d8087d2a809a9b9.zip
op-kernel-dev-97eb3f24352ec6632c2127b35d8087d2a809a9b9.tar.gz
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/hid/hid-stantum.c')
-rw-r--r--drivers/hid/hid-stantum.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-stantum.c b/drivers/hid/hid-stantum.c
index 3171be2..b2be1d1 100644
--- a/drivers/hid/hid-stantum.c
+++ b/drivers/hid/hid-stantum.c
@@ -222,7 +222,7 @@ static int stantum_probe(struct hid_device *hdev,
sd = kmalloc(sizeof(struct stantum_data), GFP_KERNEL);
if (!sd) {
- dev_err(&hdev->dev, "cannot allocate Stantum data\n");
+ hid_err(hdev, "cannot allocate Stantum data\n");
return -ENOMEM;
}
sd->valid = false;
OpenPOWER on IntegriCloud