diff options
Diffstat (limited to 'sound/arm/sa11xx-uda1341.c')
-rw-r--r-- | sound/arm/sa11xx-uda1341.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index 174bc032d1ad..6ee912259cc5 100644 --- a/sound/arm/sa11xx-uda1341.c +++ b/sound/arm/sa11xx-uda1341.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * merged HAL layer (patches from Brian) | 21 | * merged HAL layer (patches from Brian) |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* $Id: sa11xx-uda1341.c,v 1.21 2005/01/28 19:34:04 tiwai Exp $ */ | 24 | /* $Id: sa11xx-uda1341.c,v 1.23 2005/09/09 13:22:34 tiwai Exp $ */ |
25 | 25 | ||
26 | /*************************************************************************************************** | 26 | /*************************************************************************************************** |
27 | * | 27 | * |
@@ -918,7 +918,7 @@ static int __init sa11xx_uda1341_init(void) | |||
918 | if (card == NULL) | 918 | if (card == NULL) |
919 | return -ENOMEM; | 919 | return -ENOMEM; |
920 | 920 | ||
921 | sa11xx_uda1341 = kcalloc(1, sizeof(*sa11xx_uda1341), GFP_KERNEL); | 921 | sa11xx_uda1341 = kzalloc(sizeof(*sa11xx_uda1341), GFP_KERNEL); |
922 | if (sa11xx_uda1341 == NULL) | 922 | if (sa11xx_uda1341 == NULL) |
923 | return -ENOMEM; | 923 | return -ENOMEM; |
924 | spin_lock_init(&chip->s[0].dma_lock); | 924 | spin_lock_init(&chip->s[0].dma_lock); |
@@ -946,6 +946,9 @@ static int __init sa11xx_uda1341_init(void) | |||
946 | strcpy(card->shortname, "H3600 UDA1341TS"); | 946 | strcpy(card->shortname, "H3600 UDA1341TS"); |
947 | sprintf(card->longname, "Compaq iPAQ H3600 with Philips UDA1341TS"); | 947 | sprintf(card->longname, "Compaq iPAQ H3600 with Philips UDA1341TS"); |
948 | 948 | ||
949 | if ((err = snd_card_set_generic_dev(card)) < 0) | ||
950 | goto nodev; | ||
951 | |||
949 | if ((err = snd_card_register(card)) == 0) { | 952 | if ((err = snd_card_register(card)) == 0) { |
950 | printk( KERN_INFO "iPAQ audio support initialized\n" ); | 953 | printk( KERN_INFO "iPAQ audio support initialized\n" ); |
951 | return 0; | 954 | return 0; |