From 93ac0329db368b307c2c6d58308396325689c919 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 14 Mar 2014 16:04:56 -0400
Subject: [PATCH] weston-launch: Fix a typo causing mutter-launch to not work

---
 src/wayland/weston-launch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wayland/weston-launch.c b/src/wayland/weston-launch.c
index ae713ed23..ba1ed7476 100644
--- a/src/wayland/weston-launch.c
+++ b/src/wayland/weston-launch.c
@@ -279,7 +279,7 @@ handle_open(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
 
 	dev_major = major(s.st_rdev);
 
-	if (dev_major != INPUT_MAJOR ||
+	if (dev_major != INPUT_MAJOR &&
 	    dev_major != DRM_MAJOR) {
 		fprintf(stderr, "Device %s is not an input or DRM device\n",
 			message->path);