git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[pandora-kernel.git]
/
drivers
/
hid
/
hid-egalax.c
diff --git
a/drivers/hid/hid-egalax.c
b/drivers/hid/hid-egalax.c
index
5a1b52e
..
72b1dd8
100644
(file)
--- a/
drivers/hid/hid-egalax.c
+++ b/
drivers/hid/hid-egalax.c
@@
-223,7
+223,7
@@
static int egalax_probe(struct hid_device *hdev, const struct hid_device_id *id)
td = kzalloc(sizeof(struct egalax_data), GFP_KERNEL);
if (!td) {
td = kzalloc(sizeof(struct egalax_data), GFP_KERNEL);
if (!td) {
-
dev_err(&hdev->
dev, "cannot allocate eGalax data\n");
+
hid_err(h
dev, "cannot allocate eGalax data\n");
return -ENOMEM;
}
hid_set_drvdata(hdev, td);
return -ENOMEM;
}
hid_set_drvdata(hdev, td);