aboutsummaryrefslogtreecommitdiffstats
path: root/sound/sh/aica.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-05-04 10:00:16 -0400
committerTakashi Iwai <tiwai@suse.de>2009-05-04 10:00:16 -0400
commit3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch)
tree9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/sh/aica.c
parent18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff)
parent3e5b50165fd0be080044586f43fcdd460ed27610 (diff)
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/sh/aica.c')
-rw-r--r--sound/sh/aica.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index f551233c5a08..583a3693df75 100644
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -565,7 +565,7 @@ static int load_aica_firmware(void)
565 err = request_firmware(&fw_entry, "aica_firmware.bin", &pd->dev); 565 err = request_firmware(&fw_entry, "aica_firmware.bin", &pd->dev);
566 if (unlikely(err)) 566 if (unlikely(err))
567 return err; 567 return err;
568 /* write firware into memory */ 568 /* write firmware into memory */
569 spu_disable(); 569 spu_disable();
570 spu_memload(0, fw_entry->data, fw_entry->size); 570 spu_memload(0, fw_entry->data, fw_entry->size);
571 spu_enable(); 571 spu_enable();