summaryrefslogtreecommitdiffstats
path: root/tools/serial_probe/serial.c
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-21 17:09:00 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-21 17:09:00 +0000
commit9938f4264e1db36f12c1faef8e57b7641942dfeb (patch)
tree5c87b738a42a5cf1fbb73053425e7cd87c15541c /tools/serial_probe/serial.c
parentc21139e9999865ec9d3c9cc90d92b95e28c8a28d (diff)
downloaddrakx-backup-do-not-use-9938f4264e1db36f12c1faef8e57b7641942dfeb.tar
drakx-backup-do-not-use-9938f4264e1db36f12c1faef8e57b7641942dfeb.tar.gz
drakx-backup-do-not-use-9938f4264e1db36f12c1faef8e57b7641942dfeb.tar.bz2
drakx-backup-do-not-use-9938f4264e1db36f12c1faef8e57b7641942dfeb.tar.xz
drakx-backup-do-not-use-9938f4264e1db36f12c1faef8e57b7641942dfeb.zip
- sync with rh
- keep CLASS_UNSPEC handling
Diffstat (limited to 'tools/serial_probe/serial.c')
-rw-r--r--tools/serial_probe/serial.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/serial_probe/serial.c b/tools/serial_probe/serial.c
index 332ae1861..bf1944553 100644
--- a/tools/serial_probe/serial.c
+++ b/tools/serial_probe/serial.c
@@ -937,13 +937,14 @@ struct device *serialProbe(enum deviceClass probeClass, int probeFlags,
if (
- (probeClass == CLASS_UNSPEC) ||
- (probeClass == CLASS_OTHER) ||
- (probeClass == CLASS_MOUSE) ||
- (probeClass == CLASS_MODEM) ||
- (probeClass == CLASS_PRINTER)
+ (probeClass & CLASS_UNSPEC) ||
+ (probeClass & CLASS_OTHER) ||
+ (probeClass & CLASS_MOUSE) ||
+ (probeClass & CLASS_MODEM) ||
+ (probeClass & CLASS_PRINTER)
) {
int x;
+
for (x=0; x<=3 ; x++) {
struct stat sbuf;
char lockfile[32];