projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[BNX2]: Fix race conditions when calling register_netdev().
[powerpc.git]
/
sound
/
oss
/
au1550_ac97.c
diff --git
a/sound/oss/au1550_ac97.c
b/sound/oss/au1550_ac97.c
index
c1168fa
..
a339f0c
100644
(file)
--- a/
sound/oss/au1550_ac97.c
+++ b/
sound/oss/au1550_ac97.c
@@
-57,9
+57,9
@@
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/hardirq.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/hardirq.h>
-#include <asm/mach-au1x00/au1000.h>
#include <asm/mach-au1x00/au1xxx_psc.h>
#include <asm/mach-au1x00/au1xxx_dbdma.h>
#include <asm/mach-au1x00/au1xxx_psc.h>
#include <asm/mach-au1x00/au1xxx_dbdma.h>
+#include <asm/mach-au1x00/au1xxx.h>
#undef OSS_DOCUMENTED_MIXER_SEMANTICS
#undef OSS_DOCUMENTED_MIXER_SEMANTICS
@@
-213,7
+213,8
@@
rdcodec(struct ac97_codec *codec, u8 addr)
}
if (i == POLL_COUNT) {
err("rdcodec: read poll expired!");
}
if (i == POLL_COUNT) {
err("rdcodec: read poll expired!");
- return 0;
+ data = 0;
+ goto out;
}
/* wait for command done?
}
/* wait for command done?
@@
-226,7
+227,8
@@
rdcodec(struct ac97_codec *codec, u8 addr)
}
if (i == POLL_COUNT) {
err("rdcodec: read cmdwait expired!");
}
if (i == POLL_COUNT) {
err("rdcodec: read cmdwait expired!");
- return 0;
+ data = 0;
+ goto out;
}
data = au_readl(PSC_AC97CDC) & 0xffff;
}
data = au_readl(PSC_AC97CDC) & 0xffff;
@@
-237,6
+239,7
@@
rdcodec(struct ac97_codec *codec, u8 addr)
au_writel(PSC_AC97EVNT_CD, PSC_AC97EVNT);
au_sync();
au_writel(PSC_AC97EVNT_CD, PSC_AC97EVNT);
au_sync();
+ out:
spin_unlock_irqrestore(&s->lock, flags);
return data;
spin_unlock_irqrestore(&s->lock, flags);
return data;
@@
-716,8
+719,7
@@
prog_dmabuf_dac(struct au1550_state *s)
}
}
-static void
-dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static void dac_dma_interrupt(int irq, void *dev_id)
{
struct au1550_state *s = (struct au1550_state *) dev_id;
struct dmabuf *db = &s->dma_dac;
{
struct au1550_state *s = (struct au1550_state *) dev_id;
struct dmabuf *db = &s->dma_dac;
@@
-751,8
+753,7
@@
dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
}
}
-static void
-adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static void adc_dma_interrupt(int irq, void *dev_id)
{
struct au1550_state *s = (struct au1550_state *)dev_id;
struct dmabuf *dp = &s->dma_adc;
{
struct au1550_state *s = (struct au1550_state *)dev_id;
struct dmabuf *dp = &s->dma_adc;
@@
-1353,11
+1354,11
@@
au1550_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
((file->f_mode & FMODE_READ) && s->dma_adc.mapped);
#ifdef DEBUG
((file->f_mode & FMODE_READ) && s->dma_adc.mapped);
#ifdef DEBUG
- for (count
=0; count<sizeof(ioctl_str)/sizeof(ioctl_str[0]
); count++) {
+ for (count
= 0; count < ARRAY_SIZE(ioctl_str
); count++) {
if (ioctl_str[count].cmd == cmd)
break;
}
if (ioctl_str[count].cmd == cmd)
break;
}
- if (count <
sizeof(ioctl_str) / sizeof(ioctl_str[0]
))
+ if (count <
ARRAY_SIZE(ioctl_str
))
pr_debug("ioctl %s, arg=0x%lxn", ioctl_str[count].str, arg);
else
pr_debug("ioctl 0x%x unknown, arg=0x%lx\n", cmd, arg);
pr_debug("ioctl %s, arg=0x%lxn", ioctl_str[count].str, arg);
else
pr_debug("ioctl 0x%x unknown, arg=0x%lx\n", cmd, arg);
@@
-1892,6
+1893,8
@@
static /*const */ struct file_operations au1550_audio_fops = {
MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com");
MODULE_DESCRIPTION("Au1550 AC97 Audio Driver");
MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com");
MODULE_DESCRIPTION("Au1550 AC97 Audio Driver");
+MODULE_LICENSE("GPL");
+
static int __devinit
au1550_probe(void)
static int __devinit
au1550_probe(void)