diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-07-25 17:01:14 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-07-25 17:01:14 +0200 |
| commit | cf81d6b583444cb6f5e656f050e43413b236354e (patch) | |
| tree | 646567ef019e0bbc5cc9db0e26c464a9fc239481 /sound/i2c/other/ak4117.c | |
| parent | 76df52969711ae3725a98f26fbbc6a349803dcbf (diff) | |
| parent | 275353bb684ecfeb42f7a353fead81d43a01c519 (diff) | |
Merge branch 'for-next' into for-linus
Merged 4.8 changes.
Diffstat (limited to 'sound/i2c/other/ak4117.c')
| -rw-r--r-- | sound/i2c/other/ak4117.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index 48848909a5a9..0702f0552d19 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c @@ -110,7 +110,7 @@ int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t __fail: snd_ak4117_free(chip); - return err < 0 ? err : -EIO; + return err; } void snd_ak4117_reg_write(struct ak4117 *chip, unsigned char reg, unsigned char mask, unsigned char val) |