Skip to content

Commit

Permalink
[PATCH] paride-pt: register_chrdev fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Mar 28, 2006
1 parent 8637980 commit 829d5f6
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/block/paride/pt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
int unit, err = 0;
int unit;
int err;

if (disable) {
err = -1;
Expand All @@ -955,14 +956,15 @@ static int __init pt_init(void)
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);
for (unit = 0; unit < PT_UNITS; unit++)
if (pt[unit].present)
pi_release(pt[unit].pi);
err = -1;
goto out;
}
major = err;
pt_class = class_create(THIS_MODULE, "pt");
if (IS_ERR(pt_class)) {
err = PTR_ERR(pt_class);
Expand Down

0 comments on commit 829d5f6

Please sign in to comment.