Skip to content

Commit 6058cf9

Browse files
jgross1gregkh
authored andcommitted
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b689dfb commit 6058cf9

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/video/fbdev/xen-fbfront.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,6 @@ static void xenfb_backend_changed(struct xenbus_device *dev,
644644
break;
645645

646646
case XenbusStateInitWait:
647-
InitWait:
648647
xenbus_switch_state(dev, XenbusStateConnected);
649648
break;
650649

@@ -655,7 +654,8 @@ static void xenfb_backend_changed(struct xenbus_device *dev,
655654
* get Connected twice here.
656655
*/
657656
if (dev->state != XenbusStateConnected)
658-
goto InitWait; /* no InitWait seen yet, fudge it */
657+
/* no InitWait seen yet, fudge it */
658+
xenbus_switch_state(dev, XenbusStateConnected);
659659

660660
if (xenbus_scanf(XBT_NIL, info->xbdev->otherend,
661661
"request-update", "%d", &val) < 0)

0 commit comments

Comments
 (0)