summaryrefslogtreecommitdiffstats
path: root/sys/dev/firewire
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/firewire')
-rw-r--r--sys/dev/firewire/firewire.h2
-rw-r--r--sys/dev/firewire/fwdev.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/firewire/firewire.h b/sys/dev/firewire/firewire.h
index ee510e6..39d8fd1 100644
--- a/sys/dev/firewire/firewire.h
+++ b/sys/dev/firewire/firewire.h
@@ -417,7 +417,7 @@ struct fw_crom_buf {
#endif
#define MAKEMINOR(f, u, s) \
- unit2minor((f) | (((u) & 0xff) << 8) | (s & 0xff))
+ ((f) | (((u) & 0xff) << 8) | (s & 0xff))
#define DEV2UNIT(x) ((dev2unit(x) & 0xff00) >> 8)
#define DEV2SUB(x) (dev2unit(x) & 0xff)
diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c
index 9e6602d..9cbb5e4 100644
--- a/sys/dev/firewire/fwdev.c
+++ b/sys/dev/firewire/fwdev.c
@@ -213,7 +213,7 @@ fw_open (struct cdev *dev, int flags, int fmt, fw_proc *td)
int unit = DEV2UNIT(dev);
int sub = DEV2SUB(dev);
- make_dev(&firewire_cdevsw, minor(dev),
+ make_dev(&firewire_cdevsw, dev2unit(dev),
UID_ROOT, GID_OPERATOR, 0660,
"fw%d.%d", unit, sub);
}
OpenPOWER on IntegriCloud