Skip to content

Commit

Permalink
xilinx icap: BKL pushdown
Browse files Browse the repository at this point in the history
Add explicit lock_kernel() calls to hwicap_open() even though the existing
locking looks adequate.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  • Loading branch information
Jonathan Corbet committed Jun 20, 2008
1 parent f97259e commit f4943db
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/char/xilinx_hwicap/xilinx_hwicap.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
#include <linux/poll.h>
#include <linux/proc_fs.h>
#include <linux/mutex.h>
#include <linux/smp_lock.h>
#include <linux/sysctl.h>
#include <linux/version.h>
#include <linux/fs.h>
Expand Down Expand Up @@ -504,11 +505,12 @@ static int hwicap_open(struct inode *inode, struct file *file)
struct hwicap_drvdata *drvdata;
int status;

lock_kernel();
drvdata = container_of(inode->i_cdev, struct hwicap_drvdata, cdev);

status = mutex_lock_interruptible(&drvdata->sem);
if (status)
return status;
goto out;

if (drvdata->is_open) {
status = -EBUSY;
Expand All @@ -528,6 +530,8 @@ static int hwicap_open(struct inode *inode, struct file *file)

error:
mutex_unlock(&drvdata->sem);
out:
unlock_kernel();
return status;
}

Expand Down

0 comments on commit f4943db

Please sign in to comment.