| From: Juergen Gross <jgross@suse.com> |
| Date: Fri, 7 Apr 2017 17:28:23 +0200 |
| Subject: 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> |
| --- |
| drivers/video/xen-fbfront.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/video/xen-fbfront.c |
| +++ b/drivers/video/xen-fbfront.c |
| @@ -640,7 +640,6 @@ static void xenfb_backend_changed(struct |
| 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) |
