diff --git a/[refs] b/[refs] index cf863d4ac64a..4b6384295519 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cea96778196dcf7127d6bbbf296c1651848650f2 +refs/heads/master: a405f43ee336fb890fd967625cc133f9d2e59a9f diff --git a/trunk/drivers/staging/line6/audio.c b/trunk/drivers/staging/line6/audio.c index 3aa946899ced..e2ac8d60f8c2 100644 --- a/trunk/drivers/staging/line6/audio.c +++ b/trunk/drivers/staging/line6/audio.c @@ -27,11 +27,12 @@ int line6_init_audio(struct usb_line6 *line6) { static int dev; struct snd_card *card; + int err; - card = snd_card_new(line6_index[dev], line6_id[dev], THIS_MODULE, 0); - - if (card == NULL) - return -ENOMEM; + err = snd_card_create(line6_index[dev], line6_id[dev], THIS_MODULE, 0, + &card); + if (err < 0) + return err; line6->card = card;