diff options
Diffstat (limited to 'fs/proc/proc_tty.c')
| -rw-r--r-- | fs/proc/proc_tty.c | 18 | 
1 files changed, 4 insertions, 14 deletions
| diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c index 854827b1d463..83adcc869437 100644 --- a/fs/proc/proc_tty.c +++ b/fs/proc/proc_tty.c @@ -144,22 +144,12 @@ void proc_tty_register_driver(struct tty_driver *driver)  {  	struct proc_dir_entry *ent; -	if (!driver->driver_name || driver->proc_entry) +	if (!driver->driver_name || driver->proc_entry || +	    !driver->ops->proc_fops)  		return; -	if (driver->ops->proc_fops) { -		ent = proc_create_data(driver->driver_name, 0, proc_tty_driver, -				       driver->ops->proc_fops, driver); -		if (!ent) -			return; -	} else if (driver->ops->read_proc) { -		ent = create_proc_entry(driver->driver_name, 0, proc_tty_driver); -		if (!ent) -			return; -		ent->read_proc = driver->ops->read_proc; -		ent->data = driver; -	} else -		return; +	ent = proc_create_data(driver->driver_name, 0, proc_tty_driver, +			       driver->ops->proc_fops, driver);  	driver->proc_entry = ent;  } | 
