From f22dcee1425b7d5ee331e3b2ae1c9c056ef422bd Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Mon, 13 Jul 2009 22:22:49 -0700
Subject: [PATCH] --- yaml --- r: 155613 b: refs/heads/master c:
 f936601471d1454dacbd3b2a961fd4d883090aeb h: refs/heads/master i:   155611:
 b84ebf5dcf0992cfd4a3197b8df07ae4dbf96afa v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/input/evdev.c  | 3 +--
 trunk/drivers/input/joydev.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index babb36f66ec3..f316a107c876 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0a14de2f82dd6aa13e04816da2091c7ed0f77cf
+refs/heads/master: f936601471d1454dacbd3b2a961fd4d883090aeb
diff --git a/trunk/drivers/input/evdev.c b/trunk/drivers/input/evdev.c
index 114efd8dc8f5..1148140d08a1 100644
--- a/trunk/drivers/input/evdev.c
+++ b/trunk/drivers/input/evdev.c
@@ -608,8 +608,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
 						    p, compat_mode);
 
 			if (_IOC_NR(cmd) == _IOC_NR(EVIOCGNAME(0)))
-				return str_to_user(dev_name(&evdev->dev),
-						   _IOC_SIZE(cmd), p);
+				return str_to_user(dev->name, _IOC_SIZE(cmd), p);
 
 			if (_IOC_NR(cmd) == _IOC_NR(EVIOCGPHYS(0)))
 				return str_to_user(dev->phys, _IOC_SIZE(cmd), p);
diff --git a/trunk/drivers/input/joydev.c b/trunk/drivers/input/joydev.c
index 0e12f89276a3..4cfd084fa897 100644
--- a/trunk/drivers/input/joydev.c
+++ b/trunk/drivers/input/joydev.c
@@ -536,7 +536,7 @@ static int joydev_ioctl_common(struct joydev *joydev,
 	default:
 		if ((cmd & ~IOCSIZE_MASK) == JSIOCGNAME(0)) {
 			int len;
-			const char *name = dev_name(&dev->dev);
+			const char *name = dev->name;
 
 			if (!name)
 				return 0;