diff options
Diffstat (limited to 'sound/core/init.c')
-rw-r--r-- | sound/core/init.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 41e224986f35..d9ee27ae9a51 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -420,7 +420,7 @@ int snd_card_register(snd_card_t * card) | |||
420 | int err; | 420 | int err; |
421 | snd_info_entry_t *entry; | 421 | snd_info_entry_t *entry; |
422 | 422 | ||
423 | snd_runtime_check(card != NULL, return -EINVAL); | 423 | snd_assert(card != NULL, return -EINVAL); |
424 | if ((err = snd_device_register_all(card)) < 0) | 424 | if ((err = snd_device_register_all(card)) < 0) |
425 | return err; | 425 | return err; |
426 | write_lock(&snd_card_rwlock); | 426 | write_lock(&snd_card_rwlock); |
@@ -524,7 +524,8 @@ int __init snd_card_info_init(void) | |||
524 | snd_info_entry_t *entry; | 524 | snd_info_entry_t *entry; |
525 | 525 | ||
526 | entry = snd_info_create_module_entry(THIS_MODULE, "cards", NULL); | 526 | entry = snd_info_create_module_entry(THIS_MODULE, "cards", NULL); |
527 | snd_runtime_check(entry != NULL, return -ENOMEM); | 527 | if (! entry) |
528 | return -ENOMEM; | ||
528 | entry->c.text.read_size = PAGE_SIZE; | 529 | entry->c.text.read_size = PAGE_SIZE; |
529 | entry->c.text.read = snd_card_info_read; | 530 | entry->c.text.read = snd_card_info_read; |
530 | if (snd_info_register(entry) < 0) { | 531 | if (snd_info_register(entry) < 0) { |
@@ -840,7 +841,7 @@ static int snd_generic_resume(struct device *dev) | |||
840 | card = get_snd_generic_card(dev); | 841 | card = get_snd_generic_card(dev); |
841 | if (card->power_state == SNDRV_CTL_POWER_D0) | 842 | if (card->power_state == SNDRV_CTL_POWER_D0) |
842 | return 0; | 843 | return 0; |
843 | if (card->pm_suspend) | 844 | if (card->pm_resume) |
844 | card->pm_resume(card); | 845 | card->pm_resume(card); |
845 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); | 846 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); |
846 | return 0; | 847 | return 0; |