Merge tag 'v3.7-rc4' into next to sync up Wacom bits
Linux 3.7-rc4
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user