Merge branch 'next-footbridge' of git://aeryn.fluff.org.uk/bjdooks/linux

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

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 408df0bd6be50a0b17798b189506c266d0ba34bf..1730d7331a5dff13a6841fd0009066f49cde6666 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -242,7 +242,7 @@ static void input_handle_event(struct input_dev *dev,
                break;
        }
 
-       if (type != EV_SYN)
+       if (disposition != INPUT_IGNORE_EVENT && type != EV_SYN)
                dev->sync = 0;
 
        if ((disposition & INPUT_PASS_TO_DEVICE) && dev->event)
@@ -1389,8 +1389,8 @@ int input_register_device(struct input_dev *dev)
        if (!dev->setkeycode)
                dev->setkeycode = input_default_setkeycode;
 
-       snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
-                "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);
+       dev_set_name(&dev->dev, "input%ld",
+                    (unsigned long) atomic_inc_return(&input_no) - 1);
 
        error = device_add(&dev->dev);
        if (error)