Driver fixes
PATCH 1/1 Driver fixes
Hi Linus!
Please apply this driver bugfix to your 2.6.16 tree, thanks!
[CM4000,CM4040] Driver fixes
Using this patch, Omnikey CardMan 4000 and 4040 devices automatically get their device nodes created by udev.
Also, we now check for (and handle) failure of pcmcia_register_driver()
Signed-off-by Harald Welte <[email protected]>
---
drivers/char/pcmcia/cm4000_cs.c +21 -3
@@ -13,11 +13,12 @@* * (C) 2000,2001,2002,2003,2004 Omnikey AG * -* (C) 2005 Harald Welte <[email protected]> +* (C) 2005-2006 Harald Welte <[email protected]> * - Adhere to Kernel CodingStyle * - Port to 2.6.13 "new" style PCMCIA * - Check for copy_{from,to}_user return values * - Use nonseekable_open() +* - add class interface for udev device creation * * All rights reserved. Licensed under dual BSD/GPL license. */
@@ -56,7 +57,7 @@ module_param(pc_debug, int, 0600);#else #define DEBUGP(n, rdr, x, args...)#endif -static char *version ="cm4000_cs.c v2.4.0gm5 - All bugs added by Harald Welte" ; +static char *version ="cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte" ;#define T_1SEC (HZ)#define T_10MSEC msecs_to_jiffies(10)
@@ -156,6 +157,7 @@ struct cm4000_dev { /*queue*/ 4*sizeof(wait_queue_head_t))static dev_link_t *dev_table[CM4000_MAX_DEV ]; +static struct class *cmm_class;/* This table doesn't use spaces after the comma between fields and thus * violates CodingStyle. However, I don't really think wrapping it around will
@@ -1937,6 +1939,9 @@ static int cm4000_attach(struct pcmcia_d link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ;cm4000_config (link, i); +class_device_create (cmm_class,NULL ,MKDEV (major, i),NULL , +"cmm%d" , i); +return 0 ; }
@@ -1962,6 +1967,8 @@ static void cm4000_detach(struct pcmcia_ dev_table[devno] =NULL ;kfree (dev); +class_device_destroy (cmm_class,MKDEV (major, devno)); +return ; }
@@ -1995,8 +2002,18 @@ static struct pcmcia_driver cm4000_drivestatic int __init cmm_init (void ) { +int rc; +printk (KERN_INFO "%s\n" , version); -pcmcia_register_driver (&cm4000_driver); + + cmm_class =class_create (THIS_MODULE ,"cardman_4000" ); +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
@@ -2012,6 +2029,7 @@ static void __exit cmm_exit(void) printk(KERN_INFO MODULE_NAME ": unloading\n");pcmcia_unregister_driver (&cm4000_driver);unregister_chrdev (major,DEVICE_NAME ); +class_destroy (cmm_class); };module_init (cmm_init);
drivers/char/pcmcia/cm4040_cs.c +20 -3
@@ -3,12 +3,13 @@* * (c) 2000-2004 Omnikey AG (http://www.omnikey.com/) * -* (C) 2005 Harald Welte <[email protected]> +* (C) 2005-2006 Harald Welte <[email protected]> * - add support for poll() * - driver cleanup * - add waitqueues * - adhere to linux kernel coding style and policies * - support 2.6.13 "new style" pcmcia interface +* - add class interface for udev device creation * * The device basically is a USB CCID compliant device that has been * attached to an I/O-Mapped FIFO.
@@ -53,7 +54,7 @@ module_param(pc_debug, int, 0600);#endif static char *version = -"OMNIKEY CardMan 4040 v1.1.0gm4 - All bugs added by Harald Welte" ; +"OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte" ;#define CCID_DRIVER_BULK_DEFAULT_TIMEOUT (150*HZ)#define CCID_DRIVER_ASYNC_POWERUP_TIMEOUT (35*HZ)
@@ -67,6 +68,7 @@ static char *version =static void reader_release (dev_link_t *link);static int major; +static struct class *cmx_class;#define BS_READABLE 0x01#define BS_WRITABLE 0x02
@@ -696,6 +698,9 @@ static int reader_attach(struct pcmcia_d link->state |=DEV_PRESENT |DEV_CONFIG_PENDING ;reader_config (link, i); +class_device_create (cmx_class,NULL ,MKDEV (major, i),NULL , +"cmx%d" , i); +return 0 ; }
@@ -721,6 +726,8 @@ static void reader_detach(struct pcmcia_ dev_table[devno] =NULL ;kfree (dev); +class_device_destroy (cmx_class,MKDEV (major, devno)); +return ; }
@@ -755,8 +762,17 @@ static struct pcmcia_driver reader_drivestatic int __init cm4040_init (void ) { +int rc; +printk (KERN_INFO "%s\n" , version); -pcmcia_register_driver (&reader_driver); + cmx_class =class_create (THIS_MODULE ,"cardman_4040" ); +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
@@ -771,6 +787,7 @@ static void __exit cm4040_exit(void) printk(KERN_INFO MODULE_NAME ": unloading\n");pcmcia_unregister_driver (&reader_driver);unregister_chrdev (major,DEVICE_NAME ); +class_destroy (cmx_class); }module_init (cm4040_init);
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)