aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/es1688/es1688.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/es1688/es1688.c')
-rw-r--r--sound/isa/es1688/es1688.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index cdcfb57f1f0a..76001fe0579d 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -187,8 +187,8 @@ static int snd_es1688_isa_probe(struct device *dev, unsigned int n)
187 struct snd_card *card; 187 struct snd_card *card;
188 int error; 188 int error;
189 189
190 error = snd_card_create(index[n], id[n], THIS_MODULE, 190 error = snd_card_new(dev, index[n], id[n], THIS_MODULE,
191 sizeof(struct snd_es1688), &card); 191 sizeof(struct snd_es1688), &card);
192 if (error < 0) 192 if (error < 0)
193 return error; 193 return error;
194 194
@@ -196,8 +196,6 @@ static int snd_es1688_isa_probe(struct device *dev, unsigned int n)
196 if (error < 0) 196 if (error < 0)
197 goto out; 197 goto out;
198 198
199 snd_card_set_dev(card, dev);
200
201 error = snd_es1688_probe(card, n); 199 error = snd_es1688_probe(card, n);
202 if (error < 0) 200 if (error < 0)
203 goto out; 201 goto out;
@@ -274,8 +272,9 @@ static int snd_es968_pnp_detect(struct pnp_card_link *pcard,
274 if (dev == SNDRV_CARDS) 272 if (dev == SNDRV_CARDS)
275 return -ENODEV; 273 return -ENODEV;
276 274
277 error = snd_card_create(index[dev], id[dev], THIS_MODULE, 275 error = snd_card_new(&pcard->card->dev,
278 sizeof(struct snd_es1688), &card); 276 index[dev], id[dev], THIS_MODULE,
277 sizeof(struct snd_es1688), &card);
279 if (error < 0) 278 if (error < 0)
280 return error; 279 return error;
281 chip = card->private_data; 280 chip = card->private_data;
@@ -285,7 +284,6 @@ static int snd_es968_pnp_detect(struct pnp_card_link *pcard,
285 snd_card_free(card); 284 snd_card_free(card);
286 return error; 285 return error;
287 } 286 }
288 snd_card_set_dev(card, &pcard->card->dev);
289 error = snd_es1688_probe(card, dev); 287 error = snd_es1688_probe(card, dev);
290 if (error < 0) 288 if (error < 0)
291 return error; 289 return error;