diff options
author | Mark Brown <broonie@kernel.org> | 2015-11-10 19:01:58 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-11-10 19:01:58 +0000 |
commit | 2a148b6f2726ced30f796435f61d6e915c979784 (patch) | |
tree | 48d233fa5639677b16b10a3442029f3a2e40ef92 /lib/fault-inject.c | |
parent | 021c5d9469960b8c68aa1d1825f7bfd8d61e157d (diff) | |
parent | bb9a13a0209c56cdf27d125a1f2f6f34378c64f4 (diff) |
Merge tag 'asoc-v4.3-rc6' into asoc-fix-rcar
ASoC: Updates for v4.4
Not much core work here, a few small tweaks to interfaces but mainly the
changes here are driver ones. Highlights include:
- Updates to the topology userspace interface
- Big updates to the Renesas support from Morimoto-san
- Most of the support for Intel Sky Lake systems.
- New drivers for Asahi Kasei Microdevices AK4613, Allwinnner A10,
Cirrus Logic WM8998, Dialog DA7219, Nuvoton NAU8825 and Rockchip
S/PDIF.
Diffstat (limited to 'lib/fault-inject.c')
-rw-r--r-- | lib/fault-inject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fault-inject.c b/lib/fault-inject.c index f1cdeb024d172..6a823a53e357b 100644 --- a/lib/fault-inject.c +++ b/lib/fault-inject.c @@ -44,7 +44,7 @@ static void fail_dump(struct fault_attr *attr) printk(KERN_NOTICE "FAULT_INJECTION: forcing a failure.\n" "name %pd, interval %lu, probability %lu, " "space %d, times %d\n", attr->dname, - attr->probability, attr->interval, + attr->interval, attr->probability, atomic_read(&attr->space), atomic_read(&attr->times)); if (attr->verbose > 1) |