Commit ee49c88c authored by Jaroslav Kysela's avatar Jaroslav Kysela

ALSA CVS update - Takashi Iwai <tiwai@suse.de>

ALSA Core,Timer Midlevel,ALSA sequencer,PPC DACA driver
PPC Tumbler driver
- check rootfs before calling request_module() to avoid annoying
  error messages at the boot time.
parent 4f7a5009
......@@ -137,7 +137,7 @@ client_t *snd_seq_client_use_ptr(int clientid)
if (clientid < 64) {
int idx;
if (! client_requested[clientid]) {
if (! client_requested[clientid] && current->fs->root) {
client_requested[clientid] = 1;
for (idx = 0; idx < 64; idx++) {
if (seq_client_load[idx] < 0)
......
......@@ -132,6 +132,9 @@ void snd_seq_device_load_drivers(void)
#ifdef CONFIG_KMOD
struct list_head *head;
if (! current->fs->root)
return;
down(&ops_mutex);
list_for_each(head, &opslist) {
ops_list_t *ops = list_entry(head, ops_list_t, list);
......
......@@ -77,6 +77,8 @@ void snd_request_card(int card)
{
int locked;
if (! current->fs->root)
return;
read_lock(&snd_card_rwlock);
locked = snd_cards_lock & (1 << card);
read_unlock(&snd_card_rwlock);
......@@ -91,6 +93,8 @@ static void snd_request_other(int minor)
{
char *str;
if (! current->fs->root)
return;
switch (minor) {
case SNDRV_MINOR_SEQUENCER: str = "snd-seq"; break;
case SNDRV_MINOR_TIMER: str = "snd-timer"; break;
......
......@@ -148,6 +148,8 @@ static snd_timer_t *snd_timer_find(snd_timer_id_t *tid)
static void snd_timer_request(snd_timer_id_t *tid)
{
if (! current->fs->root)
return;
switch (tid->dev_class) {
case SNDRV_TIMER_CLASS_GLOBAL:
if (tid->device < timer_limit)
......
......@@ -249,7 +249,8 @@ int __init snd_pmac_daca_init(pmac_t *chip)
pmac_daca_t *mix;
#ifdef CONFIG_KMOD
request_module("i2c-keywest");
if (current->fs->root)
request_module("i2c-keywest");
#endif /* CONFIG_KMOD */
mix = kmalloc(sizeof(*mix), GFP_KERNEL);
......
......@@ -993,7 +993,8 @@ int __init snd_pmac_tumbler_init(pmac_t *chip)
char *chipname;
#ifdef CONFIG_KMOD
request_module("i2c-keywest");
if (current->fs->root)
request_module("i2c-keywest");
#endif /* CONFIG_KMOD */
mix = kmalloc(sizeof(*mix), GFP_KERNEL);
......
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