Fix udev device creation
PATCH 1/1 Fix udev device creation
Hi!
Please apply this fix for the cm40x0 device drivers. It's obvious, clean, affects only those two devices, so I hope it'll make it in 2.6.17-final.
Thanks!
[Cardman 40x0] Fix udev device creation
This patch corrects the order of the calls to register_chrdev() and pcmcia_register_driver(). Now udev correctly creates userspace device files /dev/cmmN and /dev/cmxN respectively.
Based on an earlier patch by Jan Niehusmann <[email protected]>.
---
commit 3599bbbe2873942dcc68bc50dec7a91868373654
tree 7523c29329841e6375943ef50d23c74179ff85d2
parent 33f85f1beef2ebbcacaec5518ec3ed7c42d44508
author Harald Welte <[email protected]> Wed, 12 Apr 2006 17:41:01 +0200 committer Harald Welte <[email protected]> Wed, 12 Apr 2006 17:41:01 +0200
drivers/char/pcmcia/cm4000_cs.c | 10 ++++++---- drivers/char/pcmcia/cm4040_cs.c | 11 +++++++---- 2 files changed, 13 insertions(+), 8 deletions(-)
drivers/char/pcmcia/cm4000_cs.c +6 -4
@@ -1981,10 +1981,6 @@ static int __init cmm_init(void)if (!cmm_class)return -1 ; - rc =pcmcia_register_driver (&cm4000_driver); -if (rc <0 ) -return rc; - major =register_chrdev (0 ,DEVICE_NAME , &cm4000_fops);if (major <0 ) { printk(KERN_WARNING MODULE_NAME
@@ -1992,6 +1988,12 @@ static int __init cmm_init(void)return -1 ; } + rc =pcmcia_register_driver (&cm4000_driver); +if (rc <0 ) { +unregister_chrdev (major,DEVICE_NAME ); +return rc; + } +return 0 ; }
drivers/char/pcmcia/cm4040_cs.c +7 -4
@@ -724,16 +724,19 @@ static int __init cm4040_init(void)if (!cmx_class)return -1 ; - rc =pcmcia_register_driver (&reader_driver); -if (rc <0 ) -return rc; - major =register_chrdev (0 ,DEVICE_NAME , &reader_fops);if (major <0 ) { printk(KERN_WARNING MODULE_NAME ": could not get major number\n");return -1 ; } + + rc =pcmcia_register_driver (&reader_driver); +if (rc <0 ) { +unregister_chrdev (major,DEVICE_NAME ); +return rc; + } +return 0 ; }
Signature · 4 lines
- Harald Welte <[email protected]> http://gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)