diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-07-03 19:51:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-07-03 19:51:42 +0200 |
| commit | 818a23e3882b1bf65d1719e407be04716e69a4d5 (patch) | |
| tree | 6e4267b570541f779e7d85c11eb14312fa86fbb1 /fs/ocfs2/export.c | |
| parent | ALSA: hda/realtek - Remove GPIO_MASK (diff) | |
| parent | Merge remote-tracking branch 'asoc/topic/inte' into asoc-next (diff) | |
| download | linux-818a23e3882b1bf65d1719e407be04716e69a4d5.tar.xz linux-818a23e3882b1bf65d1719e407be04716e69a4d5.zip | |
Merge tag 'asoc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.13
The big news with this release is the of-graph card, this provides a
replacement for simple-card that is much more flexibile and scalable,
allowing many more systems to use a generic sound card than was possible
before:
- The of-graph card, finally merged after a long and dedicated effort
by Morimoto-san.
- New widget types intended mainly for use with DSPs.
- New drivers for Allwinner V3s SoCs, Ensonic ES8316, several classes
of x86 machine, Rockchip PDM controllers, STM32 I2S and S/PDIF
controllers and ZTE AUD96P22 CODECs.
Diffstat (limited to 'fs/ocfs2/export.c')
| -rw-r--r-- | fs/ocfs2/export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c index 827fc9809bc2..9f88188060db 100644 --- a/fs/ocfs2/export.c +++ b/fs/ocfs2/export.c @@ -119,7 +119,7 @@ check_err: if (IS_ERR(inode)) { mlog_errno(PTR_ERR(inode)); - result = (void *)inode; + result = ERR_CAST(inode); goto bail; } |