diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 10:03:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 10:03:29 +0100 |
| commit | 70324494b6f283311c5339fb1795fdec2d8850d9 (patch) | |
| tree | 5a318c2b60ba6e7861d630310d1930f62b8893ce /drivers/input/misc/xen-kbdfront.c | |
| parent | 73b5301b02c8d3456a5ea64c9ed9802a4a376af6 (diff) | |
| parent | e47a682ace0cd56eb8e09b806c2b0f034b491520 (diff) | |
| download | blackbird-obmc-linux-70324494b6f283311c5339fb1795fdec2d8850d9.tar.gz blackbird-obmc-linux-70324494b6f283311c5339fb1795fdec2d8850d9.zip | |
Merge branch 'spi-linus' into spi-next
Diffstat (limited to 'drivers/input/misc/xen-kbdfront.c')
| -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; |
