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

Commit 1fa984b5 authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

sh: cdev lock_kernel() pushdown 



Push the cdev lock_kernel() call down into the sh gio driver.

Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent 7558da94

arch/sh/boards/landisk/gio.c

+7 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */

#include <linux/module.h>

#include <linux/init.h>

#include <linux/smp_lock.h>

#include <linux/kdev_t.h>

#include <linux/cdev.h>

#include <linux/fs.h>
@@ -32,17 +33,20 @@ static int openCnt; 
static int gio_open(struct inode *inode, struct file *filp)

{

	int minor;

	int ret = -ENOENT;



	lock_kernel();

	minor = MINOR(inode->i_rdev);

	if (minor < DEVCOUNT) {

		if (openCnt > 0) {

			return -EALREADY;

			ret = -EALREADY;

		} else {

			openCnt++;

			return 0;

			ret = 0;

		}

	}

	return -ENOENT;

	unlock_kernel();

	return ret;

}



static int gio_close(struct inode *inode, struct file *filp)