git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
core
/
sound_oss.c
diff --git
a/sound/core/sound_oss.c
b/sound/core/sound_oss.c
index
74f0fe5
..
4566df4
100644
(file)
--- a/
sound/core/sound_oss.c
+++ b/
sound/core/sound_oss.c
@@
-106,7
+106,7
@@
int snd_register_oss_device(int type, struct snd_card *card, int dev,
int cidx = SNDRV_MINOR_OSS_CARD(minor);
int track2 = -1;
int register1 = -1, register2 = -1;
int cidx = SNDRV_MINOR_OSS_CARD(minor);
int track2 = -1;
int register1 = -1, register2 = -1;
- struct device *carddev =
NULL
;
+ struct device *carddev =
snd_card_get_device_link(card)
;
if (card && card->number >= 8)
return 0; /* ignore silently */
if (card && card->number >= 8)
return 0; /* ignore silently */
@@
-134,8
+134,6
@@
int snd_register_oss_device(int type, struct snd_card *card, int dev,
track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI1);
break;
}
track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI1);
break;
}
- if (card)
- carddev = card->dev;
register1 = register_sound_special_device(f_ops, minor, carddev);
if (register1 != minor)
goto __end;
register1 = register_sound_special_device(f_ops, minor, carddev);
if (register1 != minor)
goto __end;
@@
-270,8
+268,7
@@
int __init snd_minor_info_oss_init(void)
int __exit snd_minor_info_oss_done(void)
{
int __exit snd_minor_info_oss_done(void)
{
- if (snd_minor_info_oss_entry)
- snd_info_unregister(snd_minor_info_oss_entry);
+ snd_info_free_entry(snd_minor_info_oss_entry);
return 0;
}
#endif /* CONFIG_PROC_FS */
return 0;
}
#endif /* CONFIG_PROC_FS */