diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 15:50:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 15:50:35 -0800 |
| commit | 1a56f54c351d8d2e276aefc4f4094037c178d6c7 (patch) | |
| tree | 88abb7801141db3d03079bd0ef2a903cbf3a1aba /sound | |
| parent | d1ffa5669cd834f901141756e63195f48c1bfbf9 (diff) | |
| parent | 2c4c6b27028b38204de8ade505f925d53d234422 (diff) | |
| download | linux-1a56f54c351d8d2e276aefc4f4094037c178d6c7.tar.gz linux-1a56f54c351d8d2e276aefc4f4094037c178d6c7.tar.bz2 linux-1a56f54c351d8d2e276aefc4f4094037c178d6c7.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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) writel(0x1fff, aaci->base + AACI_INTCLR); writel(aaci->maincr, aaci->base + AACI_MAINCR); + ret = aaci_probe_ac97(aaci); + if (ret) + goto out; + /* - * Size the FIFOs. + * Size the FIFOs (must be multiple of 16). */ aaci->fifosize = aaci_size_fifo(aaci); - - ret = aaci_probe_ac97(aaci); - if (ret) + if (aaci->fifosize & 15) { + printk(KERN_WARNING "AACI: fifosize = %d not supported\n", + aaci->fifosize); + ret = -ENODEV; goto out; + } ret = aaci_init_pcm(aaci); if (ret) |