git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
isa
/
sscape.c
diff --git
a/sound/isa/sscape.c
b/sound/isa/sscape.c
index
b1f2582
..
29bba8c
100644
(file)
--- a/
sound/isa/sscape.c
+++ b/
sound/isa/sscape.c
@@
-897,10
+897,11
@@
static int __devinit create_mpu401(struct snd_card *card, int devnum, unsigned l
struct snd_rawmidi *rawmidi;
int err;
struct snd_rawmidi *rawmidi;
int err;
+#define MPU401_SHARE_HARDWARE 1
if ((err = snd_mpu401_uart_new(card, devnum,
MPU401_HW_MPU401,
if ((err = snd_mpu401_uart_new(card, devnum,
MPU401_HW_MPU401,
- port, MPU401_
INFO_INTEGRATED
,
- irq,
IRQF_DISABLED
,
+ port, MPU401_
SHARE_HARDWARE
,
+ irq,
SA_INTERRUPT
,
&rawmidi)) == 0) {
struct snd_mpu401 *mpu = (struct snd_mpu401 *) rawmidi->private_data;
mpu->open_input = mpu401_open;
&rawmidi)) == 0) {
struct snd_mpu401 *mpu = (struct snd_mpu401 *) rawmidi->private_data;
mpu->open_input = mpu401_open;
@@
-1254,7
+1255,7
@@
static int __devinit create_sscape(int dev, struct snd_card **rcardp)
}
}
-static int __
dev
init snd_sscape_probe(struct platform_device *pdev)
+static int __init snd_sscape_probe(struct platform_device *pdev)
{
int dev = pdev->id;
struct snd_card *card;
{
int dev = pdev->id;
struct snd_card *card;
@@
-1426,8
+1427,8
@@
static int __init sscape_manual_probe(void)
dma[i] == SNDRV_AUTO_DMA) {
printk(KERN_INFO
"sscape: insufficient parameters, need IO, IRQ, MPU-IRQ and DMA\n");
dma[i] == SNDRV_AUTO_DMA) {
printk(KERN_INFO
"sscape: insufficient parameters, need IO, IRQ, MPU-IRQ and DMA\n");
-
sscape_unregister_all()
;
-
return -ENXIO
;
+
ret = -ENXIO
;
+
goto errout
;
}
/*
}
/*
@@
-1435,15
+1436,17
@@
static int __init sscape_manual_probe(void)
*/
device = platform_device_register_simple(SSCAPE_DRIVER,
i, NULL, 0);
*/
device = platform_device_register_simple(SSCAPE_DRIVER,
i, NULL, 0);
- if (IS_ERR(device))
- continue;
- if (!platform_get_drvdata(device)) {
- platform_device_unregister(device);
- continue;
+ if (IS_ERR(device)) {
+ ret = PTR_ERR(device);
+ goto errout;
}
platform_devices[i] = device;
}
return 0;
}
platform_devices[i] = device;
}
return 0;
+
+ errout:
+ sscape_unregister_all();
+ return ret;
}
static void sscape_exit(void)
}
static void sscape_exit(void)
@@
-1466,7
+1469,7
@@
static int __init sscape_init(void)
if (ret < 0)
return ret;
#ifdef CONFIG_PNP
if (ret < 0)
return ret;
#ifdef CONFIG_PNP
- if (pnp_register_card_driver(&sscape_pnpc_driver)
=
= 0)
+ if (pnp_register_card_driver(&sscape_pnpc_driver)
>
= 0)
pnp_registered = 1;
#endif
return 0;
pnp_registered = 1;
#endif
return 0;