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

Commit 6d9eac34 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] capi: register_chrdev() fix 



If the user specified `major=0' (odd thing to do), capi.c will use dynamic
allocation.  We need to pick up that major for subsequent unregister_chrdev().

Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 829d5f68

drivers/isdn/capi/capi.c

+5 −3
Original line number Diff line number Diff line
@@ -1485,6 +1485,7 @@ static int __init capi_init(void) 
{

	char *p;

	char *compileinfo;

	int major_ret;



	if ((p = strchr(revision, ':')) != 0 && p[1]) {

		strlcpy(rev, p + 2, sizeof(rev));
@@ -1493,11 +1494,12 @@ static int __init capi_init(void) 
	} else

		strcpy(rev, "1.0");



	if (register_chrdev(capi_major, "capi20", &capi_fops)) {

	major_ret = register_chrdev(capi_major, "capi20", &capi_fops);

	if (major_ret < 0) {

		printk(KERN_ERR "capi20: unable to get major %d\n", capi_major);

		return -EIO;

		return major_ret;

	}



	capi_major = major_ret;

	capi_class = class_create(THIS_MODULE, "capi");

	if (IS_ERR(capi_class)) {

		unregister_chrdev(capi_major, "capi20");