Commit 25368ca5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jonathan Corbet

tpm-tpm: BKL pushdown

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 09de3613
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/smp_lock.h>
#include "tpm.h" #include "tpm.h"
...@@ -897,6 +898,7 @@ int tpm_open(struct inode *inode, struct file *file) ...@@ -897,6 +898,7 @@ int tpm_open(struct inode *inode, struct file *file)
int rc = 0, minor = iminor(inode); int rc = 0, minor = iminor(inode);
struct tpm_chip *chip = NULL, *pos; struct tpm_chip *chip = NULL, *pos;
lock_kernel();
spin_lock(&driver_lock); spin_lock(&driver_lock);
list_for_each_entry(pos, &tpm_chip_list, list) { list_for_each_entry(pos, &tpm_chip_list, list) {
...@@ -926,16 +928,19 @@ int tpm_open(struct inode *inode, struct file *file) ...@@ -926,16 +928,19 @@ int tpm_open(struct inode *inode, struct file *file)
if (chip->data_buffer == NULL) { if (chip->data_buffer == NULL) {
chip->num_opens--; chip->num_opens--;
put_device(chip->dev); put_device(chip->dev);
unlock_kernel();
return -ENOMEM; return -ENOMEM;
} }
atomic_set(&chip->data_pending, 0); atomic_set(&chip->data_pending, 0);
file->private_data = chip; file->private_data = chip;
unlock_kernel();
return 0; return 0;
err_out: err_out:
spin_unlock(&driver_lock); spin_unlock(&driver_lock);
unlock_kernel();
return rc; return rc;
} }
EXPORT_SYMBOL_GPL(tpm_open); EXPORT_SYMBOL_GPL(tpm_open);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment