git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[pandora-kernel.git]
/
sound
/
oss
/
kahlua.c
diff --git
a/sound/oss/kahlua.c
b/sound/oss/kahlua.c
index
12e7b30
..
eb9bc36
100644
(file)
--- a/
sound/oss/kahlua.c
+++ b/
sound/oss/kahlua.c
@@
-67,7
+67,7
@@
static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
return 1;
mem = ioremap(base, 128);
return 1;
mem = ioremap(base, 128);
- if
(mem == 0UL
)
+ if
(!mem
)
return 1;
map = readw(mem + 0x18); /* Read the SMI enables */
iounmap(mem);
return 1;
map = readw(mem + 0x18); /* Read the SMI enables */
iounmap(mem);
@@
-139,13
+139,12
@@
static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
printk(KERN_INFO "kahlua: XpressAudio on IRQ %d, DMA %d, %d\n",
irq, dma8, dma16);
printk(KERN_INFO "kahlua: XpressAudio on IRQ %d, DMA %d, %d\n",
irq, dma8, dma16);
- hw_config = k
m
alloc(sizeof(struct address_info), GFP_KERNEL);
+ hw_config = k
z
alloc(sizeof(struct address_info), GFP_KERNEL);
if(hw_config == NULL)
{
printk(KERN_ERR "kahlua: out of memory.\n");
return 1;
}
if(hw_config == NULL)
{
printk(KERN_ERR "kahlua: out of memory.\n");
return 1;
}
- memset(hw_config, 0, sizeof(*hw_config));
pci_set_drvdata(pdev, hw_config);
pci_set_drvdata(pdev, hw_config);