From dee443a0ed7f2cbe2bb1b53089c0c7415e8b60c3 Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Thu, 3 Dec 2009 07:44:47 +0000
Subject: [PATCH] --- yaml --- r: 177492 b: refs/heads/master c:
 2d5db0be4ce36b265f9ddd8debab40acd8580403 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 91393578808e..028ce74011a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1df8d8d4efb7bce0e44d2aa91c4c0fa7ffe613c0
+refs/heads/master: 2d5db0be4ce36b265f9ddd8debab40acd8580403
diff --git a/trunk/drivers/platform/x86/asus_acpi.c b/trunk/drivers/platform/x86/asus_acpi.c
index ddf5240ade8c..25a7d57fe449 100644
--- a/trunk/drivers/platform/x86/asus_acpi.c
+++ b/trunk/drivers/platform/x86/asus_acpi.c
@@ -1334,9 +1334,6 @@ static int asus_hotk_add(struct acpi_device *device)
 	acpi_status status = AE_OK;
 	int result;
 
-	if (!device)
-		return -EINVAL;
-
 	printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
 	       ASUS_ACPI_VERSION);
 
@@ -1392,9 +1389,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;
-
 	asus_hotk_remove_fs(device);
 
 	kfree(hotk);