dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton 2006-03-28 01:56:18 -08:00 committed by Linus Torvalds
parent a687fb18cb
commit 8637980bab
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/paride/pg.c
View File

@ -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) static int __init pg_init(void)
{ {
int unit, err = 0; int unit;
int err;
if (disable){ if (disable){
err = -1; err = -1;
@ -657,16 +658,17 @@ static int __init pg_init(void)
goto out; 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); printk("pg_init: unable to get major number %d\n", major);
for (unit = 0; unit < PG_UNITS; unit++) { for (unit = 0; unit < PG_UNITS; unit++) {
struct pg *dev = &devices[unit]; struct pg *dev = &devices[unit];
if (dev->present) if (dev->present)
pi_release(dev->pi); pi_release(dev->pi);
} }
err = -1;
goto out; goto out;
} }
major = err; /* In case the user specified `major=0' (dynamic) */
pg_class = class_create(THIS_MODULE, "pg"); pg_class = class_create(THIS_MODULE, "pg");
if (IS_ERR(pg_class)) { if (IS_ERR(pg_class)) {
err = PTR_ERR(pg_class); err = PTR_ERR(pg_class);