splice: only return -EAGAIN if there's hope of more data

[linux-2.6-omap-h63xx.git] / drivers / input / mouse / vsxxxaa.c

diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index c3d64fcc858d26f0e3104d2c23328d6aa0d60c5a..404eedd5ffa2b7e039db5c7508971450e7ae1a4c 100644 (file)
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -330,7 +330,7 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse)
 
        /*
         * Check for Power-On-Reset packets. These are sent out
-        * after plugging the mouse in, or when explicitely
+        * after plugging the mouse in, or when explicitly
         * requested by sending 'T'.
         *
         * [0]: 1       0       1       0       R3      R2      R1      R0
@@ -508,8 +508,7 @@ vsxxxaa_connect (struct serio *serio, struct serio_driver *drv)
        input_dev->name = mouse->name;
        input_dev->phys = mouse->phys;
        input_dev->id.bustype = BUS_RS232;
-       input_dev->cdev.dev = &serio->dev;
-       input_dev->private = mouse;
+       input_dev->dev.parent = &serio->dev;
 
        set_bit (EV_KEY, input_dev->evbit);             /* We have buttons */
        set_bit (EV_REL, input_dev->evbit);