chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5618b56
)
Always open the cdrom drive in non-blocking mode in cdrom_id
author
Greg Kroah-Hartman
<gregkh@suse.de>
Wed, 17 Aug 2005 23:09:03 +0000
(16:09 -0700)
committer
Greg 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
patch
|
blob
|
history
diff --git
a/extras/cdrom_id/cdrom_id.c
b/extras/cdrom_id/cdrom_id.c
index 3d627811867b3f848831f6ee324838a2336eaf88..c561112d3063f72d697e2aa2d8d7415b7a959a50 100644
(file)
--- 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;
}
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;
if (fd < 0) {
err("unable to open '%s'", node);
rc = 1;