summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/asus-laptop.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-10-23 21:14:52 +0200
committerMatthew Garrett <matthew.garrett@nebula.com>2013-11-21 00:51:03 +0100
commitb222cca6002c9396c0ac03b68756f8c565d73561 (patch)
tree9606fde2e51be15aff436c6fae5ac36e3b615b23 /drivers/platform/x86/asus-laptop.c
parentsony-laptop: fixe typos in sony_laptop_input_keycode_map (diff)
downloadlinux-b222cca6002c9396c0ac03b68756f8c565d73561.tar.xz
linux-b222cca6002c9396c0ac03b68756f8c565d73561.zip
platform:x86: Remove OOM message after input_allocate_device
Emitting an OOM message isn't necessary after input_allocate_device as there's a generic OOM and a dump_stack already done. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers/platform/x86/asus-laptop.c')
-rw-r--r--drivers/platform/x86/asus-laptop.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 0e9c169b42f8..594323a926cf 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -1494,10 +1494,9 @@ static int asus_input_init(struct asus_laptop *asus)
int error;
input = input_allocate_device();
- if (!input) {
- pr_warn("Unable to allocate input device\n");
+ if (!input)
return -ENOMEM;
- }
+
input->name = "Asus Laptop extra buttons";
input->phys = ASUS_LAPTOP_FILE "/input0";
input->id.bustype = BUS_HOST;