summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2017-04-07 18:28:23 +0300
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-04-07 18:28:23 +0300
commit9121b15b5628b38b4695282dc18c553440e0f79b (patch)
treee45c6b0905bb159b4790156914bf0ea1e0d55cd8 /drivers/video
parentcfc5b2b551d8c089079e754525839101b1b43624 (diff)
downloadlinux-9121b15b5628b38b4695282dc18c553440e0f79b.tar.xz
xen, fbfront: fix connecting to backend
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. Cc: stable@vger.kernel.org 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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/xen-fbfront.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c
index d0115a7af0a9..3ee309c50b2d 100644
--- a/drivers/video/fbdev/xen-fbfront.c
+++ b/drivers/video/fbdev/xen-fbfront.c
@@ -643,7 +643,6 @@ static void xenfb_backend_changed(struct xenbus_device *dev,
break;
case XenbusStateInitWait:
-InitWait:
xenbus_switch_state(dev, XenbusStateConnected);
break;
@@ -654,7 +653,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_read_unsigned(info->xbdev->otherend,
"request-update", 0))