diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-30 19:08:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-30 19:08:06 +0200 |
| commit | 0ae3aba2865a5a6f5ee82e9651f0a69daf19d79c (patch) | |
| tree | ca4884719ad40ba247df7954d8d7cf86b9a01239 /sound/soc/samsung/s3c24xx-i2s.c | |
| parent | ALSA: emu10k1: Emu10k2 32 bit DMA mode (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/samsung' and 'aso... (diff) | |
| download | linux-0ae3aba2865a5a6f5ee82e9651f0a69daf19d79c.tar.xz linux-0ae3aba2865a5a6f5ee82e9651f0a69daf19d79c.zip | |
Merge tag 'asoc-v4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.1
A few fixes for v4.1, none earth shattering and mostly driver related
except for one change to fix !PM builds for Intel platforms which is
done by adding stubs in the core so other platforms don't run into the
same issue.
Diffstat (limited to 'sound/soc/samsung/s3c24xx-i2s.c')
| -rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 326d3c3804e3..5bf723689692 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -461,8 +461,8 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) return -ENOENT; } s3c24xx_i2s.regs = devm_ioremap_resource(&pdev->dev, res); - if (s3c24xx_i2s.regs == NULL) - return -ENXIO; + if (IS_ERR(s3c24xx_i2s.regs)) + return PTR_ERR(s3c24xx_i2s.regs); s3c24xx_i2s_pcm_stereo_out.dma_addr = res->start + S3C2410_IISFIFO; s3c24xx_i2s_pcm_stereo_in.dma_addr = res->start + S3C2410_IISFIFO; |