diff options
Diffstat (limited to 'sound/drivers/mpu401/mpu401.c')
-rw-r--r-- | sound/drivers/mpu401/mpu401.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c index d3cbbb047582..17cc105b26fc 100644 --- a/sound/drivers/mpu401/mpu401.c +++ b/sound/drivers/mpu401/mpu401.c | |||
@@ -83,7 +83,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard) | |||
83 | if ((err = snd_mpu401_uart_new(card, 0, | 83 | if ((err = snd_mpu401_uart_new(card, 0, |
84 | MPU401_HW_MPU401, | 84 | MPU401_HW_MPU401, |
85 | port[dev], 0, | 85 | port[dev], 0, |
86 | irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL)) < 0) { | 86 | irq[dev], irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL)) < 0) { |
87 | printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]); | 87 | printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]); |
88 | goto _err; | 88 | goto _err; |
89 | } | 89 | } |
@@ -160,8 +160,9 @@ static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device, | |||
160 | return -ENODEV; | 160 | return -ENODEV; |
161 | } | 161 | } |
162 | if (pnp_port_len(device, 0) < IO_EXTENT) { | 162 | if (pnp_port_len(device, 0) < IO_EXTENT) { |
163 | snd_printk(KERN_ERR "PnP port length is %ld, expected %d\n", | 163 | snd_printk(KERN_ERR "PnP port length is %llu, expected %d\n", |
164 | pnp_port_len(device, 0), IO_EXTENT); | 164 | (unsigned long long)pnp_port_len(device, 0), |
165 | IO_EXTENT); | ||
165 | return -ENODEV; | 166 | return -ENODEV; |
166 | } | 167 | } |
167 | port[dev] = pnp_port_start(device, 0); | 168 | port[dev] = pnp_port_start(device, 0); |