From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 17 Aug 2005 23:09:03 +0000 (-0700)
Subject: Always open the cdrom drive in non-blocking mode in cdrom_id
X-Git-Tag: 174~2616^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fc046d4d08f686bcdb91c015b5b35c35e2c205a0;ds=sidebyside

Always open the cdrom drive in non-blocking mode in cdrom_id

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 3d6278118..c561112d3 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -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;