summaryrefslogtreecommitdiffstats
path: root/arch/s390/crypto/prng.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-06 05:57:19 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-06 05:57:19 -0400
commit1bb025f6db789ea0bb674eaed15ee843ef0b2e88 (patch)
treecdbaa7f57ce541abb5b973803712a9f55307c355 /arch/s390/crypto/prng.c
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
parentf75587b8ca69768c6cf8a38a0b61e68e1bea3d36 (diff)
downloadtalos-op-linux-1bb025f6db789ea0bb674eaed15ee843ef0b2e88.tar.gz
talos-op-linux-1bb025f6db789ea0bb674eaed15ee843ef0b2e88.zip
Merge tag 'extcon-fixes-for-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus
Chanwoo writes: Update extcon for v4.6-rc3 This patch fixes the following one issue: - In extcon-palmas.c, the external abort happen when wake-up from suspend state on BeagleBoard-X15 platform. So, drop the IRQF_EARLY_RESUME flag.
Diffstat (limited to 'arch/s390/crypto/prng.c')
-rw-r--r--arch/s390/crypto/prng.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index b8045b97f4fb..d750cc0dfe30 100644
--- a/arch/s390/crypto/prng.c
+++ b/arch/s390/crypto/prng.c
@@ -669,11 +669,13 @@ static const struct file_operations prng_tdes_fops = {
static struct miscdevice prng_sha512_dev = {
.name = "prandom",
.minor = MISC_DYNAMIC_MINOR,
+ .mode = 0644,
.fops = &prng_sha512_fops,
};
static struct miscdevice prng_tdes_dev = {
.name = "prandom",
.minor = MISC_DYNAMIC_MINOR,
+ .mode = 0644,
.fops = &prng_tdes_fops,
};
OpenPOWER on IntegriCloud