aboutsummaryrefslogtreecommitdiffstats
path: root/sound/sparc/cs4231.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/sparc/cs4231.c')
-rw-r--r--sound/sparc/cs4231.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 36f9fe4d7bea..2fb27c4e951f 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1915,6 +1915,9 @@ static int cs4231_attach_finish(snd_card_t *card, cs4231_t *chip)
1915 if ((err = snd_cs4231_timer(chip)) < 0) 1915 if ((err = snd_cs4231_timer(chip)) < 0)
1916 goto out_err; 1916 goto out_err;
1917 1917
1918 if ((err = snd_card_set_generic_dev(card)) < 0)
1919 goto out_err;
1920
1918 if ((err = snd_card_register(card)) < 0) 1921 if ((err = snd_card_register(card)) < 0)
1919 goto out_err; 1922 goto out_err;
1920 1923
@@ -1966,7 +1969,7 @@ static int __init snd_cs4231_sbus_create(snd_card_t *card,
1966 int err; 1969 int err;
1967 1970
1968 *rchip = NULL; 1971 *rchip = NULL;
1969 chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); 1972 chip = kzalloc(sizeof(*chip), GFP_KERNEL);
1970 if (chip == NULL) 1973 if (chip == NULL)
1971 return -ENOMEM; 1974 return -ENOMEM;
1972 1975
@@ -2080,7 +2083,7 @@ static int __init snd_cs4231_ebus_create(snd_card_t *card,
2080 int err; 2083 int err;
2081 2084
2082 *rchip = NULL; 2085 *rchip = NULL;
2083 chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); 2086 chip = kzalloc(sizeof(*chip), GFP_KERNEL);
2084 if (chip == NULL) 2087 if (chip == NULL)
2085 return -ENOMEM; 2088 return -ENOMEM;
2086 2089