Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6117d213 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

isapnp: BKL removal 



Remove BKL use from isapnp_proc_bus_lseek(), like was done for
proc_bus_pci_lseek() a long time ago and recently for Zorro
by Geert Uytterhoeven.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jaroslav Kysela <perex@perex.cz>
parent cfdb00a7

drivers/pnp/isapnp/proc.c

+8 −7
Original line number Diff line number Diff line
@@ -31,8 +31,9 @@ static struct proc_dir_entry *isapnp_proc_bus_dir = NULL; 
static loff_t isapnp_proc_bus_lseek(struct file *file, loff_t off, int whence)

{

	loff_t new = -1;

	struct inode *inode = file->f_path.dentry->d_inode;



	lock_kernel();

	mutex_lock(&inode->i_mutex);

	switch (whence) {

	case 0:

		new = off;
@@ -44,12 +45,12 @@ static loff_t isapnp_proc_bus_lseek(struct file *file, loff_t off, int whence) 
		new = 256 + off;

		break;

	}

	if (new < 0 || new > 256) {

		unlock_kernel();

		return -EINVAL;

	}

	unlock_kernel();

	return (file->f_pos = new);

	if (new < 0 || new > 256)

		new = -EINVAL;

	else

		file->f_pos = new;

	mutex_unlock(&inode->i_mutex);

	return new;

}



static ssize_t isapnp_proc_bus_read(struct file *file, char __user * buf,