aboutsummaryrefslogtreecommitdiffstats
path: root/sound/ppc/snd_ps3.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/ppc/snd_ps3.c')
-rw-r--r--sound/ppc/snd_ps3.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index bc823a547550..1aa52eff526a 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -24,6 +24,7 @@
24#include <linux/init.h> 24#include <linux/init.h>
25#include <linux/interrupt.h> 25#include <linux/interrupt.h>
26#include <linux/io.h> 26#include <linux/io.h>
27#include <linux/module.h>
27 28
28#include <sound/asound.h> 29#include <sound/asound.h>
29#include <sound/control.h> 30#include <sound/control.h>
@@ -845,7 +846,7 @@ static int __devinit snd_ps3_allocate_irq(void)
845 return ret; 846 return ret;
846 } 847 }
847 848
848 ret = request_irq(the_card.irq_no, snd_ps3_interrupt, IRQF_DISABLED, 849 ret = request_irq(the_card.irq_no, snd_ps3_interrupt, 0,
849 SND_PS3_DRIVER_NAME, &the_card); 850 SND_PS3_DRIVER_NAME, &the_card);
850 if (ret) { 851 if (ret) {
851 pr_info("%s: request_irq failed (%d)\n", __func__, ret); 852 pr_info("%s: request_irq failed (%d)\n", __func__, ret);
@@ -875,7 +876,7 @@ static void __devinit snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
875 (0x0fUL << 12) | 876 (0x0fUL << 12) |
876 (PS3_AUDIO_IOID); 877 (PS3_AUDIO_IOID);
877 878
878 ret = lv1_gpu_attribute(0x100, 0x007, val, 0, 0); 879 ret = lv1_gpu_attribute(0x100, 0x007, val);
879 if (ret) 880 if (ret)
880 pr_info("%s: gpu_attribute failed %d\n", __func__, 881 pr_info("%s: gpu_attribute failed %d\n", __func__,
881 ret); 882 ret);