From: Tomas Winkler <[email protected]> for in-tree driver we can use snd_card_create for backports to older kernels this can be easily wrapped
Signed-off-by: Tomas Winkler <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/staging/easycap/Makefile | 1 - drivers/staging/easycap/easycap_sound.c | 9 --------- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/drivers/staging/easycap/Makefile b/drivers/staging/easycap/Makefile index 977e153..226a779 100644 --- a/drivers/staging/easycap/Makefile +++ b/drivers/staging/easycap/Makefile @@ -9,5 +9,4 @@ ccflags-y += -DEASYCAP_NEEDS_V4L2_DEVICE_H ccflags-y += -DEASYCAP_NEEDS_V4L2_FOPS ccflags-y += -DEASYCAP_NEEDS_UNLOCKED_IOCTL ccflags-y += -DEASYCAP_NEEDS_ALSA -ccflags-y += -DEASYCAP_NEEDS_CARD_CREATE diff --git a/drivers/staging/easycap/easycap_sound.c b/drivers/staging/easycap/easycap_sound.c index 8d1c062..4bfaf06 100644 --- a/drivers/staging/easycap/easycap_sound.c +++ b/drivers/staging/easycap/easycap_sound.c @@ -107,21 +107,12 @@ if (true == peasycap->microphone) { peasycap->alsa_hardware.rate_max = 48000; } -#if defined(EASYCAP_NEEDS_CARD_CREATE) if (0 != snd_card_create(SNDRV_DEFAULT_IDX1, "easycap_alsa", THIS_MODULE, 0, &psnd_card)) { SAY("ERROR: Cannot do ALSA snd_card_create()\n"); return -EFAULT; } -#else - psnd_card = snd_card_new(SNDRV_DEFAULT_IDX1, "easycap_alsa", - THIS_MODULE, 0); - if (NULL == psnd_card) { - SAY("ERROR: Cannot do ALSA snd_card_new()\n"); - return -EFAULT; - } -#endif /*EASYCAP_NEEDS_CARD_CREATE*/ sprintf(&psnd_card->id[0], "EasyALSA%i", peasycap->minor); strcpy(&psnd_card->driver[0], EASYCAP_DRIVER_DESCRIPTION); -- 1.7.4.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
