diff options
| author | Juergen Gross <jgross@suse.com> | 2017-04-07 18:28:23 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-07-18 20:38:41 +0300 |
| commit | 581ebc29c51198443c744c04afbf0b9a021137cc (patch) | |
| tree | 89677af37c2ceb50c648bb39fa54b7f9a39b2591 /drivers/video | |
| parent | 2b846c841db527fe9afff23b70c265b1809cd792 (diff) | |
| download | linux-581ebc29c51198443c744c04afbf0b9a021137cc.tar.xz | |
xen, fbfront: fix connecting to backend
commit 9121b15b5628b38b4695282dc18c553440e0f79b upstream.
Connecting to the backend isn't working reliably in xen-fbfront: in
case XenbusStateInitWait of the backend has been missed the backend
transition to XenbusStateConnected will trigger the connected state
only without doing the actions required when the backend has
connected.
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/xen-fbfront.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c index beac52fc1c0e..7cb77acb6f08 100644 --- a/drivers/video/xen-fbfront.c +++ b/drivers/video/xen-fbfront.c @@ -640,7 +640,6 @@ static void xenfb_backend_changed(struct xenbus_device *dev, break; case XenbusStateInitWait: -InitWait: xenbus_switch_state(dev, XenbusStateConnected); break; @@ -651,7 +650,8 @@ InitWait: * get Connected twice here. */ if (dev->state != XenbusStateConnected) - goto InitWait; /* no InitWait seen yet, fudge it */ + /* no InitWait seen yet, fudge it */ + xenbus_switch_state(dev, XenbusStateConnected); if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, "request-update", "%d", &val) < 0) |