diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 11:07:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 11:07:38 -0500 |
| commit | 18821b0408efc92ec2804128ba9382a3bcebf132 (patch) | |
| tree | f98fbf75e8e8f33965e489879505fb621e2f11bb /drivers/char/hw_random | |
| parent | 3b8ecd22447c4266500c0bcf97f035310543e494 (diff) | |
| parent | 55e858c8483af427144f33b42b818b30612b82b0 (diff) | |
Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
agp: Remove the BKL from agp_open
inifiband: Remove BKL from ipath_open()
mips: Remove BKL from tb0219
drivers: Remove BKL from scx200_gpio
drivers: Remove BKL from pc8736x_gpio
parisc: Remove BKL from eisa_eeprom
rtc: Remove BKL from efirtc
input: Remove BKL from hp_sdc_rtc
hw_random: Remove BKL from core
macintosh: Remove BKL from ans-lcd
nvram: Drop the bkl from non-generic nvram_llseek()
nvram: Drop the bkl from nvram_llseek()
mem_class: Drop the bkl from memory_open()
spi: Remove BKL from spidev_open
drivers: Remove BKL from cs5535_gpio
drivers: Remove BKL from misc_open
Diffstat (limited to 'drivers/char/hw_random')
| -rw-r--r-- | drivers/char/hw_random/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c index 8b7d56a0fe3a..e989f67bb61f 100644 --- a/drivers/char/hw_random/core.c +++ b/drivers/char/hw_random/core.c | |||
| @@ -76,7 +76,6 @@ static int rng_dev_open(struct inode *inode, struct file *filp) | |||
| 76 | return -EINVAL; | 76 | return -EINVAL; |
| 77 | if (filp->f_mode & FMODE_WRITE) | 77 | if (filp->f_mode & FMODE_WRITE) |
| 78 | return -EINVAL; | 78 | return -EINVAL; |
| 79 | cycle_kernel_lock(); | ||
| 80 | return 0; | 79 | return 0; |
| 81 | } | 80 | } |
| 82 | 81 | ||