[PATCH] Fix capi devicenames
[Posted October 5, 2010 by corbet]
| From: |
| "Marc - A. Dahlhaus" <mad-AT-wol.de> |
| To: |
| linux-kernel-AT-vger.kernel.org |
| Subject: |
| [PATCH] Fix capi devicenames |
| Date: |
| Wed, 29 Sep 2010 21:21:23 +0200 |
| Message-ID: |
| <4CA391B3.1030806@wol.de> |
| Archive‑link: | |
Article |
capi device names should get changed to what userspace expects.
Without this change recent udev versions can't produce working device
nodes as the capi control device node name "capi" collides with the
"capi" directory under which userspace expects to get the application
device nodes. This also fixes the Documentation.
Signed-off-by: Marc - Andre Dahlhaus <mad@wol.de>
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -1248,10 +1248,10 @@ Your cooperation is appreciated.
68 char CAPI 2.0 interface
0 = /dev/capi20 Control device
- 1 = /dev/capi20.00 First CAPI 2.0 application
- 2 = /dev/capi20.01 Second CAPI 2.0 application
+ 1 = /dev/capi/0 First CAPI 2.0 application
+ 2 = /dev/capi/1 Second CAPI 2.0 application
...
- 20 = /dev/capi20.19 19th CAPI 2.0 application
+ 20 = /dev/capi/19 19th CAPI 2.0 application
ISDN CAPI 2.0 driver for use with CAPI 2.0
applications; currently supports the AVM B1 card.
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1363,7 +1363,7 @@ static int __init capinc_tty_init(void)
}
drv->owner = THIS_MODULE;
drv->driver_name = "capi_nc";
- drv->name = "capi";
+ drv->name = "capi/";
drv->major = 0;
drv->minor_start = 0;
drv->type = TTY_DRIVER_TYPE_SERIAL;
@@ -1509,7 +1509,7 @@ static int __init capi_init(void)
return PTR_ERR(capi_class);
}
- device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");
+ device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi20");
if (capinc_tty_init() < 0) {
device_destroy(capi_class, MKDEV(capi_major, 0));
capi device names should get changed to what userspace expects.
Without this change recent udev versions can't produce working device
nodes as the capi control device node name "capi" collides with the
"capi" directory under which userspace expects to get the application
device nodes. This also fixes the Documentation.
Signed-off-by: Marc - Andre Dahlhaus <mad@wol.de>
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -1248,10 +1248,10 @@ Your cooperation is appreciated.
68 char CAPI 2.0 interface
0 = /dev/capi20 Control device
- 1 = /dev/capi20.00 First CAPI 2.0 application
- 2 = /dev/capi20.01 Second CAPI 2.0 application
+ 1 = /dev/capi/0 First CAPI 2.0 application
+ 2 = /dev/capi/1 Second CAPI 2.0 application
...
- 20 = /dev/capi20.19 19th CAPI 2.0 application
+ 20 = /dev/capi/19 19th CAPI 2.0 application
ISDN CAPI 2.0 driver for use with CAPI 2.0
applications; currently supports the AVM B1 card.
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1363,7 +1363,7 @@ static int __init capinc_tty_init(void)
}
drv->owner = THIS_MODULE;
drv->driver_name = "capi_nc";
- drv->name = "capi";
+ drv->name = "capi/";
drv->major = 0;
drv->minor_start = 0;
drv->type = TTY_DRIVER_TYPE_SERIAL;
@@ -1509,7 +1509,7 @@ static int __init capi_init(void)
return PTR_ERR(capi_class);
}
- device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");
+ device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi20");
if (capinc_tty_init() < 0) {
device_destroy(capi_class, MKDEV(capi_major, 0));
