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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
pci
/
au88x0
/
au88x0_mpu401.c
diff --git
a/sound/pci/au88x0/au88x0_mpu401.c
b/sound/pci/au88x0/au88x0_mpu401.c
index
3027c35
..
873f486
100644
(file)
--- a/
sound/pci/au88x0/au88x0_mpu401.c
+++ b/
sound/pci/au88x0/au88x0_mpu401.c
@@
-44,9
+44,9
@@
static int __devinit snd_vortex_midi(vortex_t * vortex)
{
static int __devinit snd_vortex_midi(vortex_t * vortex)
{
- s
nd_rawmidi_t
*rmidi;
+ s
truct snd_rawmidi
*rmidi;
int temp, mode;
int temp, mode;
-
mpu401_t
*mpu;
+
struct snd_mpu401
*mpu;
int port;
#ifdef VORTEX_MPU401_LEGACY
int port;
#ifdef VORTEX_MPU401_LEGACY
@@
-95,7
+95,7
@@
static int __devinit snd_vortex_midi(vortex_t * vortex)
return temp;
}
#else
return temp;
}
#else
- port = (unsigned long)(vortex->mmio +
(VORTEX_MIDI_DATA >> 2)
);
+ port = (unsigned long)(vortex->mmio +
VORTEX_MIDI_DATA
);
if ((temp =
snd_mpu401_uart_new(vortex->card, 0, MPU401_HW_AUREAL, port,
1, 0, 0, &rmidi)) != 0) {
if ((temp =
snd_mpu401_uart_new(vortex->card, 0, MPU401_HW_AUREAL, port,
1, 0, 0, &rmidi)) != 0) {
@@
-104,8
+104,8
@@
static int __devinit snd_vortex_midi(vortex_t * vortex)
~CTRL_MIDI_PORT) & ~CTRL_MIDI_EN);
return temp;
}
~CTRL_MIDI_PORT) & ~CTRL_MIDI_EN);
return temp;
}
- mpu =
snd_magic_cast(mpu401_t, rmidi->private_data, return -ENOMEM)
;
- mpu->cport = (unsigned long)(vortex->mmio +
(VORTEX_MIDI_CMD >> 2)
);
+ mpu =
rmidi->private_data
;
+ mpu->cport = (unsigned long)(vortex->mmio +
VORTEX_MIDI_CMD
);
#endif
vortex->rmidi = rmidi;
return 0;
#endif
vortex->rmidi = rmidi;
return 0;