diff options
| author |   Tony Lindgren <tony@atomide.com> | 2021-01-15 12:48:43 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-01-15 12:48:43 +0200 |
| commit | 715a1284d89a740b197b3bad5eb20d36a397382f (patch) | |
| tree | 07ad2960ab66e56b3d1e151036262019a18e3df1 /kernel/fail_function.c | |
| parent | ARM: dts; gta04: SPI panel chip select is active low (diff) | |
| parent | ARM: OMAP2+: Fix suspcious RCU usage splats for omap_enter_idle_coupled (diff) | |
| download | linux-rng-715a1284d89a740b197b3bad5eb20d36a397382f.tar.xz linux-rng-715a1284d89a740b197b3bad5eb20d36a397382f.zip | |
Merge branch 'cpuidle-fix' into fixes
Diffstat (limited to 'kernel/fail_function.c')
| -rw-r--r-- | kernel/fail_function.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/fail_function.c b/kernel/fail_function.c index b0b1ad93fa95..60dc825ecc2b 100644 --- a/kernel/fail_function.c +++ b/kernel/fail_function.c @@ -37,9 +37,7 @@ static unsigned long adjust_error_retval(unsigned long addr, unsigned long retv) { switch (get_injectable_error_type(addr)) { case EI_ETYPE_NULL: - if (retv != 0) - return 0; - break; + return 0; case EI_ETYPE_ERRNO: if (retv < (unsigned long)-MAX_ERRNO) return (unsigned long)-EINVAL; @@ -48,6 +46,8 @@ static unsigned long adjust_error_retval(unsigned long addr, unsigned long retv) if (retv != 0 && retv < (unsigned long)-MAX_ERRNO) return (unsigned long)-EINVAL; break; + case EI_ETYPE_TRUE: + return 1; } return retv; |