Manual merge with Linus.

[sfrench/cifs-2.6.git] / drivers / input / mouse / hil_ptr.c

diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
index bfb564fd8fe2ed0a4db4d42c60b57ccd21c68705..69f02178c528c87178a3ae188181ea3c2ae581d9 100644 (file)
--- a/drivers/input/mouse/hil_ptr.c
+++ b/drivers/input/mouse/hil_ptr.c
@@ -249,10 +249,13 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
                return -ENOMEM;
 
        ptr->dev = input_allocate_device();
-       if (!ptr->dev) goto bail0;
+       if (!ptr->dev)
+               goto bail0;
+
        ptr->dev->private = ptr;
 
-       if (serio_open(serio, driver)) goto bail1;
+       if (serio_open(serio, driver))
+               goto bail1;
 
        serio_set_drvdata(serio, ptr);
        ptr->serio = serio;