xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 4.8-rc5 into char-misc-next

Browse Source 
We want the fixes in here for merging and testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2016-09-05 08:04:07 +02:00
parent 02baff3254 c6935931c1
commit fbc1ec2efe
812 changed files with 8965 additions and 4628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/hw_random/Kconfig
View File

@@ -244,7 +244,7 @@ config HW_RANDOM_TX4939
config HW_RANDOM_MXC_RNGA
tristate "Freescale i.MX RNGA Random Number Generator"
depends on ARCH_HAS_RNGA
depends on SOC_IMX31
default HW_RANDOM
---help---
This driver provides kernel-side support for the Random Number

3
drivers/char/tpm/tpm2-cmd.c
View File

@@ -957,7 +957,7 @@ int tpm2_auto_startup(struct tpm_chip *chip)
goto out;
rc = tpm2_do_selftest(chip);
if (rc != TPM2_RC_INITIALIZE) {
if (rc != 0 && rc != TPM2_RC_INITIALIZE) {
dev_err(&chip->dev, "TPM self test failed\n");
goto out;
}
@@ -974,7 +974,6 @@ int tpm2_auto_startup(struct tpm_chip *chip)
}
}
return rc;
out:
if (rc > 0)
rc = -ENODEV;