EXTRAS: cleanup and sync all Makefiles

[elogind.git] / extras / cdrom_id / cdrom_id.c

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 3d627811867b3f848831f6ee324838a2336eaf88..091bf91559102a732dd65603bbffac97c1cb3604 100644 (file)
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -107,24 +107,21 @@ int main(int argc, char *argv[])
                        node = arg;
        }
        if (!node) {
-               err("no node specified");
+               info("no node specified");
                rc = 1;
                goto exit;
        }
 
-       fd = open(node, O_RDONLY);
-       if (fd < 0)
-               if (errno == ENOMEDIUM)
-                       fd = open(node, O_RDONLY|O_NONBLOCK);
+       fd = open(node, O_RDONLY|O_NONBLOCK);
        if (fd < 0) {
-               err("unable to open '%s'", node);
+               info("unable to open '%s'", node);
                rc = 1;
                goto exit;
        }
 
        result = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
        if (result < 0) {
-               err("CDROM_GET_CABILITY failed for '%s'", node);
+               info("CDROM_GET_CAPABILITY failed for '%s'", node);
                rc = 3;
                goto close;
        }
@@ -150,8 +147,6 @@ int main(int argc, char *argv[])
 
        if (result & CDC_RAM)
                printf("ID_CDROM_RAM=1\n");
-       goto close;
-
 close:
        close(fd);
 exit: