From 1945ac610ff6dc326b826da653ab52b2a58fa961 Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Thu, 3 Dec 2009 07:44:46 +0000
Subject: [PATCH] --- yaml --- r: 177491 b: refs/heads/master c:
 1df8d8d4efb7bce0e44d2aa91c4c0fa7ffe613c0 h: refs/heads/master i:   177489:
 849a99b8c00b372b47a0bcf5f62c9c45ed681924   177487:
 00205144d870d387e2de045e4a6ca76a2a1ce77d v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/platform/x86/asus-laptop.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 25df04fad192..91393578808e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dff29b63a5bf2eaf3313cb8a84f0b7520c43401
+refs/heads/master: 1df8d8d4efb7bce0e44d2aa91c4c0fa7ffe613c0
diff --git a/trunk/drivers/platform/x86/asus-laptop.c b/trunk/drivers/platform/x86/asus-laptop.c
index b39d2bb3e75b..8af43e9b6183 100644
--- a/trunk/drivers/platform/x86/asus-laptop.c
+++ b/trunk/drivers/platform/x86/asus-laptop.c
@@ -1240,9 +1240,6 @@ static int asus_hotk_add(struct acpi_device *device)
 {
 	int result;
 
-	if (!device)
-		return -EINVAL;
-
 	pr_notice("Asus Laptop Support version %s\n",
 	       ASUS_LAPTOP_VERSION);
 
@@ -1306,9 +1303,6 @@ static int asus_hotk_add(struct acpi_device *device)
 
 static int asus_hotk_remove(struct acpi_device *device, int type)
 {
-	if (!device || !acpi_driver_data(device))
-		return -EINVAL;
-
 	kfree(hotk->name);
 	kfree(hotk);