From fc046d4d08f686bcdb91c015b5b35c35e2c205a0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 17 Aug 2005 16:09:03 -0700 Subject: Always open the cdrom drive in non-blocking mode in cdrom_id Signed-off-by: Greg Kroah-Hartman --- extras/cdrom_id/cdrom_id.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'extras/cdrom_id/cdrom_id.c') diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c index 3d62781186..c561112d30 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; -- cgit v1.2.3-54-g00ecf From a961dcbf0dabc91c0c6f9fde6195fe8209574d48 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 17 Aug 2005 16:10:32 -0700 Subject: cdrom_id: change err() to info() to help with debugging problems Signed-off-by: Greg Kroah-Hartman --- extras/cdrom_id/cdrom_id.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extras/cdrom_id/cdrom_id.c') diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c index c561112d30..941a2facfe 100644 --- a/extras/cdrom_id/cdrom_id.c +++ b/extras/cdrom_id/cdrom_id.c @@ -107,21 +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|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_CABILITY failed for '%s'", node); rc = 3; goto close; } -- cgit v1.2.3-54-g00ecf