Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fc5b1e3 authored by Harald Welte's avatar Harald Welte Committed by Linus Torvalds
Browse files

[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 <jan@gondor.com>.

Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3cd73eed

drivers/char/pcmcia/cm4000_cs.c

+6 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

}