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

Commit 8637980b authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] paride: register_chrdev fix 



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

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a687fb18

drivers/block/paride/pg.c

+5 −3
Original line number Diff line number Diff line
@@ -643,7 +643,8 @@ static ssize_t pg_read(struct file *filp, char __user *buf, size_t count, loff_t 


static int __init pg_init(void)

{

	int unit, err = 0;

	int unit;

	int err;



	if (disable){

		err = -1;
@@ -657,16 +658,17 @@ static int __init pg_init(void) 
		goto out;

	}



	if (register_chrdev(major, name, &pg_fops)) {

	err = register_chrdev(major, name, &pg_fops);

	if (err < 0) {

		printk("pg_init: unable to get major number %d\n", major);

		for (unit = 0; unit < PG_UNITS; unit++) {

			struct pg *dev = &devices[unit];

			if (dev->present)

				pi_release(dev->pi);

		}

		err = -1;

		goto out;

	}

	major = err;	/* In case the user specified `major=0' (dynamic) */

	pg_class = class_create(THIS_MODULE, "pg");

	if (IS_ERR(pg_class)) {

		err = PTR_ERR(pg_class);