Merge tag 'v3.18-rc1' into v4l_for_linus

[firefly-linux-kernel-4.4.55.git] / drivers / tty / hvc / hvc_xen.c

diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index c3d8af917ffc0dd03e4fcb2d7caeae7185aceb85..f1e57425e39ff00b1a929500f4ea297aba5ae095 100644 (file)
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -398,9 +398,6 @@ static int xencons_connect_backend(struct xenbus_device *dev,
                goto error_xenbus;
        ret = xenbus_printf(xbt, dev->nodename, "port", "%u",
                            evtchn);
-       if (ret)
-               goto error_xenbus;
-       ret = xenbus_printf(xbt, dev->nodename, "type", "ioemu");
        if (ret)
                goto error_xenbus;
        ret = xenbus_transaction_end(xbt, 0);