From 96fa5e4426d5ac79c91a5f329a0138fa334e1ae5 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Tue, 15 Mar 2011 10:07:37 +0300
Subject: [PATCH] --- yaml --- r: 243131 b: refs/heads/master c:
 a1d6086739c5b8f23a48e02e62b0e495321a2122 h: refs/heads/master i:   243129:
 c563752d761e3f7d8f45538349fe8bf76c42bd27   243127:
 b0cbc74e7af82b5759f398266d72c3f6d3dcce03 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/platform/x86/asus-wmi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8a536310f938..35fecdcb03c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0986f25fbba8827762b35222bb45d2fbb2d72fa4
+refs/heads/master: a1d6086739c5b8f23a48e02e62b0e495321a2122
diff --git a/trunk/drivers/platform/x86/asus-wmi.c b/trunk/drivers/platform/x86/asus-wmi.c
index a038595200ee..efc776cb0c66 100644
--- a/trunk/drivers/platform/x86/asus-wmi.c
+++ b/trunk/drivers/platform/x86/asus-wmi.c
@@ -1343,7 +1343,7 @@ static int show_call(struct seq_file *m, void *data)
 	else
 		seq_printf(m, "%#x(%#x, %#x) = t:%d\n", asus->debug.method_id,
 			   asus->debug.dev_id, asus->debug.ctrl_param,
-			   obj->type);
+			   obj ? obj->type : -1);
 
 	kfree(obj);