leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] paride-pt: register_chrdev fix

Browse Source 
If the user specified `major=0' (odd thing to do), pt.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 8637980bab
commit 829d5f68ec
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/pt.c
View File

@ -943,7 +943,8 @@ static ssize_t pt_write(struct file *filp, const char __user *buf, size_t count,
static int __init pt_init(void) static int __init pt_init(void)
{ {
int unit, err = 0; int unit;
int err;
if (disable) { if (disable) {
err = -1; err = -1;
@ -955,14 +956,15 @@ static int __init pt_init(void)
goto out; goto out;
} }
if (register_chrdev(major, name, &pt_fops)) { err = register_chrdev(major, name, &pt_fops);
if (err < 0) {
printk("pt_init: unable to get major number %d\n", major); printk("pt_init: unable to get major number %d\n", major);
for (unit = 0; unit < PT_UNITS; unit++) for (unit = 0; unit < PT_UNITS; unit++)
if (pt[unit].present) if (pt[unit].present)
pi_release(pt[unit].pi); pi_release(pt[unit].pi);
err = -1;
goto out; goto out;
} }
major = err;
pt_class = class_create(THIS_MODULE, "pt"); pt_class = class_create(THIS_MODULE, "pt");
if (IS_ERR(pt_class)) { if (IS_ERR(pt_class)) {
err = PTR_ERR(pt_class); err = PTR_ERR(pt_class);