2.5.2pre9: emu10k1, intermezzo, lvm
PATCH 1/1 2.5.2pre9: emu10k1, intermezzo, lvm
As far as the intermezzo patch, please refer to the set previously posted by Adam Richter: untested, but compiles.
For the lvm driver, there's still one reference to lvm_get_blksize() that should probably be changed to block_size(): untested, but compiles.
The emu10k1 driver needs a few kdev_t fixups: tested.
The two attached patches for emu10k1 and lvm are against 2.5.2pre9.
Signature · 4 lines
----------------------------------------------------------------------- Bob Tracy WTO + WIPO = DMCA? http://www.anti-dmca.org [email protected] -----------------------------------------------------------------------
drivers/sound/emu10k1/audio.c renamed from drivers/sound/emu10k1/audio.c.orig +3 -3
@@ -1098,7 +1098,7 @@static int emu10k1_audio_open (struct inode *inode,struct file *file) { -int minor =MINOR (inode->i_rdev); +int my_minor =minor (inode->i_rdev);struct emu10k1_card *card =NULL ;struct list_head *entry;struct emu10k1_wavedevice *wave_dev;
@@ -1110,7 +1110,7 @@list_for_each (entry, &emu10k1_devs) { card = list_entry(entry, struct emu10k1_card, list); -if (!((card->audio_dev ^ minor) & ~0xf ) || !((card->audio_dev1 ^ minor) & ~0xf )) +if (!((card->audio_dev ^ my_minor) & ~0xf ) || !((card->audio_dev1 ^ my_minor) & ~0xf )) goto match; }
@@ -1206,7 +1206,7 @@ woinst->buffer.fragment_size =0 ; woinst->buffer.ossfragshift =0 ; woinst->buffer.numfrags =0 ; - woinst->device = (card->audio_dev1 == minor); + woinst->device = (card->audio_dev1 == my_minor); woinst->timer.state =TIMER_STATE_UNINSTALLED ; woinst->num_voices =1 ;for (i =0 ; i <WAVEOUT_MAXVOICES ; i++) {
drivers/sound/emu10k1/midi.c renamed from drivers/sound/emu10k1/midi.c.orig +2 -2
@@ -87,7 +87,7 @@static int emu10k1_midi_open (struct inode *inode,struct file *file) { -int minor =MINOR (inode->i_rdev); +int my_minor =minor (inode->i_rdev);struct emu10k1_card *card =NULL ;struct emu10k1_mididevice *midi_dev;struct list_head *entry;
@@ -98,7 +98,7 @@list_for_each (entry, &emu10k1_devs) { card = list_entry(entry, struct emu10k1_card, list); -if (card->midi_dev == minor) +if (card->midi_dev == my_minor) goto match; }
drivers/sound/emu10k1/mixer.c renamed from drivers/sound/emu10k1/mixer.c.orig +2 -2
@@ -640,7 +640,7 @@static int emu10k1_mixer_open (struct inode *inode,struct file *file) { -int minor =MINOR (inode->i_rdev); +int my_minor =minor (inode->i_rdev);struct emu10k1_card *card =NULL ;struct list_head *entry;
@@ -649,7 +649,7 @@list_for_each (entry, &emu10k1_devs) { card = list_entry(entry, struct emu10k1_card, list); -if (card->ac97.dev_mixer == minor) +if (card->ac97.dev_mixer == my_minor) goto match; }
drivers/md/lvm.c renamed from drivers/md/lvm.c.orig +1 -1
@@ -1044,7 +1044,7 @@memset (&bio,0 ,sizeof (bio)); bio.bi_dev = inode->i_rdev; - bio.bi_size =lvm_get_blksize (bio.bi_dev);/* NEEDED by bio_sectors */ + bio.bi_size =block_size (bio.bi_dev);/* NEEDED by bio_sectors */ bio.bi_sector = block *bio_sectors (&bio); bio.bi_rw =READ ;if ((err=lvm_map (&bio)) <0 ) {