Commit 64a39157 authored by Peter Wächtler's avatar Peter Wächtler Committed by Linus Torvalds

[PATCH] oss/ite8172.c - convert cli to spinlocks

parent 9781bbe6
...@@ -826,7 +826,7 @@ static void it8172_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -826,7 +826,7 @@ static void it8172_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static int it8172_open_mixdev(struct inode *inode, struct file *file) static int it8172_open_mixdev(struct inode *inode, struct file *file)
{ {
int minor = MINOR(inode->i_rdev); int minor = minor(inode->i_rdev);
struct list_head *list; struct list_head *list;
struct it8172_state *s; struct it8172_state *s;
...@@ -1196,13 +1196,13 @@ static int it8172_ioctl(struct inode *inode, struct file *file, ...@@ -1196,13 +1196,13 @@ static int it8172_ioctl(struct inode *inode, struct file *file,
case SNDCTL_DSP_RESET: case SNDCTL_DSP_RESET:
if (file->f_mode & FMODE_WRITE) { if (file->f_mode & FMODE_WRITE) {
stop_dac(s); stop_dac(s);
synchronize_irq(); synchronize_irq(s->irq);
s->dma_dac.count = s->dma_dac.total_bytes = 0; s->dma_dac.count = s->dma_dac.total_bytes = 0;
s->dma_dac.nextIn = s->dma_dac.nextOut = s->dma_dac.rawbuf; s->dma_dac.nextIn = s->dma_dac.nextOut = s->dma_dac.rawbuf;
} }
if (file->f_mode & FMODE_READ) { if (file->f_mode & FMODE_READ) {
stop_adc(s); stop_adc(s);
synchronize_irq(); synchronize_irq(s->irq);
s->dma_adc.count = s->dma_adc.total_bytes = 0; s->dma_adc.count = s->dma_adc.total_bytes = 0;
s->dma_adc.nextIn = s->dma_adc.nextOut = s->dma_adc.rawbuf; s->dma_adc.nextIn = s->dma_adc.nextOut = s->dma_adc.rawbuf;
} }
...@@ -1541,7 +1541,7 @@ static int it8172_ioctl(struct inode *inode, struct file *file, ...@@ -1541,7 +1541,7 @@ static int it8172_ioctl(struct inode *inode, struct file *file,
static int it8172_open(struct inode *inode, struct file *file) static int it8172_open(struct inode *inode, struct file *file)
{ {
int minor = MINOR(inode->i_rdev); int minor = minor(inode->i_rdev);
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
unsigned long flags; unsigned long flags;
struct list_head *list; struct list_head *list;
...@@ -1911,7 +1911,7 @@ static void __devinit it8172_remove(struct pci_dev *dev) ...@@ -1911,7 +1911,7 @@ static void __devinit it8172_remove(struct pci_dev *dev)
if (s->ps) if (s->ps)
remove_proc_entry(IT8172_MODULE_NAME, NULL); remove_proc_entry(IT8172_MODULE_NAME, NULL);
#endif /* IT8172_DEBUG */ #endif /* IT8172_DEBUG */
synchronize_irq(); synchronize_irq(s->irq);
free_irq(s->irq, s); free_irq(s->irq, s);
release_region(s->io, pci_resource_len(dev,0)); release_region(s->io, pci_resource_len(dev,0));
unregister_sound_dsp(s->dev_audio); unregister_sound_dsp(s->dev_audio);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment