diff options
| author | Dmitry Torokhov | 2012-11-08 17:51:52 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2012-11-08 17:51:52 +0100 |
| commit | fa8e2458ecfc959cd627e25ba86d8eddcb63c887 (patch) | |
| tree | d8c9dec3dac8e97e8591e6507a619959449d6344 /drivers/input/misc | |
| parent | Input: pwm-beeper - add devicetree probing support (diff) | |
| parent | Linux 3.7-rc4 (diff) | |
| download | kernel-qcow2-linux-fa8e2458ecfc959cd627e25ba86d8eddcb63c887.tar.gz kernel-qcow2-linux-fa8e2458ecfc959cd627e25ba86d8eddcb63c887.tar.xz kernel-qcow2-linux-fa8e2458ecfc959cd627e25ba86d8eddcb63c887.zip | |
Merge tag 'v3.7-rc4' into next to sync up Wacom bits
Linux 3.7-rc4
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/xen-kbdfront.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c index 02ca8680ea5b..6f7d99013031 100644 --- a/drivers/input/misc/xen-kbdfront.c +++ b/drivers/input/misc/xen-kbdfront.c @@ -311,7 +311,6 @@ static void xenkbd_backend_changed(struct xenbus_device *dev, case XenbusStateReconfiguring: case XenbusStateReconfigured: case XenbusStateUnknown: - case XenbusStateClosed: break; case XenbusStateInitWait: @@ -350,6 +349,10 @@ InitWait: break; + case XenbusStateClosed: + if (dev->state == XenbusStateClosed) + break; + /* Missed the backend's CLOSING state -- fallthrough */ case XenbusStateClosing: xenbus_frontend_closed(dev); break; |