Commit 1a30ac21 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppp devfs oops fix

From: Christoph Hellwig <hch@infradead.org>

PPP leaves the chardev registered even if we're going to fail the modprobe.
parent a5d77afe
...@@ -792,7 +792,7 @@ static struct file_operations ppp_device_fops = { ...@@ -792,7 +792,7 @@ static struct file_operations ppp_device_fops = {
/* Called at boot time if ppp is compiled into the kernel, /* Called at boot time if ppp is compiled into the kernel,
or at module load time (from init_module) if compiled as a module. */ or at module load time (from init_module) if compiled as a module. */
int __init ppp_init(void) static int __init ppp_init(void)
{ {
int err; int err;
...@@ -801,6 +801,8 @@ int __init ppp_init(void) ...@@ -801,6 +801,8 @@ int __init ppp_init(void)
if (!err) { if (!err) {
err = devfs_mk_cdev(MKDEV(PPP_MAJOR, 0), err = devfs_mk_cdev(MKDEV(PPP_MAJOR, 0),
S_IFCHR|S_IRUSR|S_IWUSR, "ppp"); S_IFCHR|S_IRUSR|S_IWUSR, "ppp");
if (err)
unregister_chrdev(PPP_MAJOR, "ppp");
} }
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment