---

yaml --- r: 155613 b: refs/heads/master c: f936601 h: refs/heads/master i: 155611: b84ebf5 v: v3
git-mirror · Jul 14, 2009 · f22dcee · f22dcee
1 parent 7a1afb3
commit f22dcee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;