From ff597642be4dcbe458566e68176756987f5f7a84 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Wed, 26 Apr 2006 00:13:57 -0400
Subject: [PATCH] --- yaml --- r: 26356 b: refs/heads/master c:
 1a0ccece05efb8a9c04b1130c24a2652239f3bea h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/input.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b36dfbe8aee4..f5913797252e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f11a7c0935637c15416679bd347bbc4eac1ca740
+refs/heads/master: 1a0ccece05efb8a9c04b1130c24a2652239f3bea
diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h
index b0e612dda0cf..16c19d710a4d 100644
--- a/trunk/include/linux/input.h
+++ b/trunk/include/linux/input.h
@@ -1016,7 +1016,8 @@ static inline void input_put_device(struct input_dev *dev)
 
 static inline void input_free_device(struct input_dev *dev)
 {
-	input_put_device(dev);
+	if (dev)
+		input_put_device(dev);
 }
 
 int input_register_device(struct input_dev *);