X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Finput%2Fjoydev.c;h=4224f0112849cb8b7b48935c96060502d01a2a7d;hb=9ff9a26b786c35ee8d2a66222924a807ec851a9f;hp=a85b1485e77499cd6afb15f46590b82951e1aa9e;hpb=c879c634c928223765cf50103ddaf32f2a55fed0;p=sfrench%2Fcifs-2.6.git

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index a85b1485e774..4224f0112849 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -159,12 +159,9 @@ static void joydev_event(struct input_handle *handle,
 
 static int joydev_fasync(int fd, struct file *file, int on)
 {
-	int retval;
 	struct joydev_client *client = file->private_data;
 
-	retval = fasync_helper(fd, file, on, &client->fasync);
-
-	return retval < 0 ? retval : 0;
+	return fasync_helper(fd, file, on, &client->fasync);
 }
 
 static void joydev_free(struct device *dev)
@@ -800,7 +797,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
 		}
 	}
 
-	strlcpy(joydev->dev.bus_id, joydev->name, sizeof(joydev->dev.bus_id));
+	dev_set_name(&joydev->dev, joydev->name);
 	joydev->dev.devt = MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor);
 	joydev->dev.class = &input_class;
 	joydev->dev.parent = &dev->dev;