diff options
| author | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /sound/sh | |
| parent | 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb (diff) | |
| parent | 8c9ed899b44c19e81859fbb0e9d659fe2f8630fc (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'sound/sh')
| -rw-r--r-- | sound/sh/aica.c | 2 |
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(); |