← Back to branch summary

~ubuntu-branches/ubuntu/lucid/linux-rt/lucid

« back to all changes in this revision

Viewing changes to sound/isa/sb/sb16.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-08-05 23:00:52 UTC
  • Revision ID: james.westby@ubuntu.com-20090805230052-7xedvqcyk9dnnxb2
Tags: 2.6.31-1.1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/isa/sb/sb16.c
324
324
#define is_isapnp_selected(dev)         0
325
325
#endif
326
326
 
327
 
static struct snd_card *snd_sb16_card_new(int dev)
 
327
static int snd_sb16_card_new(int dev, struct snd_card **cardp)
328
328
{
329
 
        struct snd_card *card = snd_card_new(index[dev], id[dev], THIS_MODULE,
330
 
                                        sizeof(struct snd_card_sb16));
331
 
        if (card == NULL)
332
 
                return NULL;
 
329
        struct snd_card *card;
 
330
        int err;
 
331
 
 
332
        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
 
333
                              sizeof(struct snd_card_sb16), &card);
 
334
        if (err < 0)
 
335
                return err;
333
336
        card->private_free = snd_sb16_free;
334
 
        return card;
 
337
        *cardp = card;
 
338
        return 0;
335
339
}
336
340
 
337
341
static int __devinit snd_sb16_probe(struct snd_card *card, int dev)
489
493
        struct snd_card *card;
490
494
        int err;
491
495
 
492
 
        card = snd_sb16_card_new(dev);
493
 
        if (! card)
494
 
                return -ENOMEM;
 
496
        err = snd_sb16_card_new(dev, &card);
 
497
        if (err < 0)
 
498
                return err;
495
499
 
496
500
        acard = card->private_data;
497
501
        /* non-PnP FM port address is hardwired with base port address */
610
614
        for ( ; dev < SNDRV_CARDS; dev++) {
611
615
                if (!enable[dev] || !isapnp[dev])
612
616
                        continue;
613
 
                card = snd_sb16_card_new(dev);
614
 
                if (! card)
615
 
                        return -ENOMEM;
 
617
                res = snd_sb16_card_new(dev, &card);
 
618
                if (res < 0)
 
619
                        return res;
616
620
                snd_card_set_dev(card, &pcard->card->dev);
617
621
                if ((res = snd_card_sb16_pnp(dev, card->private_data, pcard, pid)) < 0 ||
618
622
                    (res = snd_sb16_probe(card, dev)) < 0) {