From 80078864b77d8ab1f6ec43457ff28abd05a5aa98 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 19 Jan 2011 00:24:09 +0200 Subject: [PATCH] --- yaml --- r: 235670 b: refs/heads/master c: 5a858078942a6cb75f1d3ac44e8077bc228f32a8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/easycap/Makefile | 1 - trunk/drivers/staging/easycap/easycap_sound.c | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 4ea31221605a..4242bdbe5b38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dc6e41825aa270cfc0166beb54afb1c235dc803 +refs/heads/master: 5a858078942a6cb75f1d3ac44e8077bc228f32a8 diff --git a/trunk/drivers/staging/easycap/Makefile b/trunk/drivers/staging/easycap/Makefile index 977e1535667d..226a7795a1db 100644 --- a/trunk/drivers/staging/easycap/Makefile +++ b/trunk/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/trunk/drivers/staging/easycap/easycap_sound.c b/trunk/drivers/staging/easycap/easycap_sound.c index 8d1c0620344d..4bfaf06fb32a 100644 --- a/trunk/drivers/staging/easycap/easycap_sound.c +++ b/trunk/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);