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

Commit 37361136 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

isicom: istallion prepare for lock_kernel pushdown 



This is an ancient driver so just wrap it in lock_kernel internally and
be done.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1eac4947

drivers/char/istallion.c

+6 −0
Original line number Diff line number Diff line
@@ -4433,6 +4433,8 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un 
	done = 0;

	rc = 0;



	lock_kernel();



	switch (cmd) {

	case COM_GETPORTSTATS:

		rc = stli_getportstats(NULL, argp);
@@ -4455,6 +4457,7 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un 
		done++;

		break;

	}

	unlock_kernel();



	if (done)

		return rc;
@@ -4472,6 +4475,8 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un 
	if (brdp->state == 0)

		return -ENODEV;



	lock_kernel();



	switch (cmd) {

	case STL_BINTR:

		EBRDINTR(brdp);
@@ -4494,6 +4499,7 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un 
		rc = -ENOIOCTLCMD;

		break;

	}

	unlock_kernel();

	return rc;

}