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

Commit d78b0368 authored by Tony Jones's avatar Tony Jones Committed by Greg Kroah-Hartman
Browse files

ISDN: Convert from class_device to device for ISDN capi 



Signed-off-by: default avatarTony Jones <tonyj@suse.de>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dbc1272e

drivers/isdn/capi/capi.c

+3 −3
Original line number Diff line number Diff line
@@ -1544,11 +1544,11 @@ static int __init capi_init(void) 
		return PTR_ERR(capi_class);

	}



	class_device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");

	device_create(capi_class, NULL, MKDEV(capi_major, 0), "capi");



#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE

	if (capinc_tty_init() < 0) {

		class_device_destroy(capi_class, MKDEV(capi_major, 0));

		device_destroy(capi_class, MKDEV(capi_major, 0));

		class_destroy(capi_class);

		unregister_chrdev(capi_major, "capi20");

		return -ENOMEM;
@@ -1576,7 +1576,7 @@ static void __exit capi_exit(void) 
{

	proc_exit();



	class_device_destroy(capi_class, MKDEV(capi_major, 0));

	device_destroy(capi_class, MKDEV(capi_major, 0));

	class_destroy(capi_class);

	unregister_chrdev(capi_major, "capi20");