git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[safe/jmp/linux-2.6]
/
sound
/
oss
/
sb_common.c
diff --git
a/sound/oss/sb_common.c
b/sound/oss/sb_common.c
index
440537c
..
77d0e5e
100644
(file)
--- a/
sound/oss/sb_common.c
+++ b/
sound/oss/sb_common.c
@@
-625,7
+625,7
@@
int sb_dsp_detect(struct address_info *hw_config, int pci, int pciio, struct sb_
*/
*/
- detected_devc =
(sb_devc *)
kmalloc(sizeof(sb_devc), GFP_KERNEL);
+ detected_devc = kmalloc(sizeof(sb_devc), GFP_KERNEL);
if (detected_devc == NULL)
{
printk(KERN_ERR "sb: Can't allocate memory for device information\n");
if (detected_devc == NULL)
{
printk(KERN_ERR "sb: Can't allocate memory for device information\n");
@@
-1228,7
+1228,8
@@
int probe_sbmpu(struct address_info *hw_config, struct module *owner)
}
attach_mpu401(hw_config, owner);
if (last_sb->irq == -hw_config->irq)
}
attach_mpu401(hw_config, owner);
if (last_sb->irq == -hw_config->irq)
- last_sb->midi_irq_cookie=(void *)hw_config->slots[1];
+ last_sb->midi_irq_cookie =
+ (void *)(long) hw_config->slots[1];
return 1;
}
#endif
return 1;
}
#endif