diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/arm/aaci.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 54147c1f6361..149feb410654 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c | |||
@@ -882,14 +882,20 @@ static int __devinit aaci_probe(struct amba_device *dev, void *id) | |||
882 | writel(0x1fff, aaci->base + AACI_INTCLR); | 882 | writel(0x1fff, aaci->base + AACI_INTCLR); |
883 | writel(aaci->maincr, aaci->base + AACI_MAINCR); | 883 | writel(aaci->maincr, aaci->base + AACI_MAINCR); |
884 | 884 | ||
885 | ret = aaci_probe_ac97(aaci); | ||
886 | if (ret) | ||
887 | goto out; | ||
888 | |||
885 | /* | 889 | /* |
886 | * Size the FIFOs. | 890 | * Size the FIFOs (must be multiple of 16). |
887 | */ | 891 | */ |
888 | aaci->fifosize = aaci_size_fifo(aaci); | 892 | aaci->fifosize = aaci_size_fifo(aaci); |
889 | 893 | if (aaci->fifosize & 15) { | |
890 | ret = aaci_probe_ac97(aaci); | 894 | printk(KERN_WARNING "AACI: fifosize = %d not supported\n", |
891 | if (ret) | 895 | aaci->fifosize); |
896 | ret = -ENODEV; | ||
892 | goto out; | 897 | goto out; |
898 | } | ||
893 | 899 | ||
894 | ret = aaci_init_pcm(aaci); | 900 | ret = aaci_init_pcm(aaci); |
895 | if (ret) | 901 | if (ret) |