Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next

[~andy/linux] / sound / ppc / snd_ps3.c

diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index edce8a27e3eedc441a1c6ec1a1d835f99a798918..775bd95d4be6594ceb478c4824e27d4a8c815337 100644 (file)
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -358,7 +358,7 @@ static irqreturn_t snd_ps3_interrupt(int irq, void *dev_id)
                 * filling dummy data, serial automatically start to
                 * consume them and then will generate normal buffer
                 * empty interrupts.
-                * If both buffer underflow and buffer empty are occured,
+                * If both buffer underflow and buffer empty are occurred,
                 * it is better to do nomal data transfer than empty one
                 */
                snd_ps3_program_dma(card,
@@ -845,7 +845,7 @@ static int __devinit snd_ps3_allocate_irq(void)
                return ret;
        }
 
-       ret = request_irq(the_card.irq_no, snd_ps3_interrupt, IRQF_DISABLED,
+       ret = request_irq(the_card.irq_no, snd_ps3_interrupt, 0,
                          SND_PS3_DRIVER_NAME, &the_card);
        if (ret) {
                pr_info("%s: request_irq failed (%d)\n", __func__, ret);