diff --git a/.gitignore b/.gitignore
index cb9483a1..3e4797a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ plymouth-set-default-theme
 plymouth-log-viewer
 plymouth-upstart-bridge
 plymouthd
+plymouthd-fd-escrow
 *.pc
 tags
 *.bck
diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
index aed7bac2..bb548ef8 100644
--- a/src/libply-splash-core/ply-device-manager.c
+++ b/src/libply-splash-core/ply-device-manager.c
@@ -279,7 +279,7 @@ create_devices_for_udev_device (ply_device_manager_t *manager,
                 subsystem = udev_device_get_subsystem (device);
                 ply_trace ("device subsystem is %s", subsystem);
 
-                if (subsystem != NULL && strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
+                if (strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
                         ply_trace ("found DRM device %s", device_path);
                         renderer_type = PLY_RENDERER_TYPE_DRM;
                 } else if (strcmp (subsystem, SUBSYSTEM_FRAME_BUFFER) == 0) {
@@ -411,7 +411,7 @@ verify_add_or_change (ply_device_manager_t *manager,
                       const char           *device_path,
                       struct udev_device   *device)
 {
-        const char *subsystem = udev_device_get_subsystem (device);
+        const char *subsystem;
 
         if (strcmp (action, "add") && strcmp (action, "change"))
                 return false;