chiark / gitweb /
Always open the cdrom drive in non-blocking mode in cdrom_id
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 17 Aug 2005 23:09:03 +0000 (16:09 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 17 Aug 2005 23:09:03 +0000 (16:09 -0700)
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
extras/cdrom_id/cdrom_id.c

index 3d62781..c561112 100644 (file)
@@ -112,10 +112,7 @@ int main(int argc, char *argv[])
                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);
                rc = 1;