summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-cards.c3
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-core.c2
-rw-r--r--linux/drivers/media/video/em28xx/em28xx.h1
3 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c
index 2a7e42673..67cc75a61 100644
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c
@@ -247,7 +247,6 @@ struct em28xx_board em28xx_boards[] = {
.xclk = EM28XX_XCLK_FREQUENCY_20MHZ,
.tuner_type = TUNER_ABSENT,
.is_webcam = 1,
- .no_audio = 1,
.input = { {
.type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0,
@@ -275,7 +274,6 @@ struct em28xx_board em28xx_boards[] = {
.name = "Unknown EM2750/28xx video grabber",
.tuner_type = TUNER_ABSENT,
.is_webcam = 1, /* To enable sensor probe */
- .no_audio = 1,
},
[EM2750_BOARD_DLCW_130] = {
/* Beijing Huaqi Information Digital Technology Co., Ltd */
@@ -499,7 +497,6 @@ struct em28xx_board em28xx_boards[] = {
.name = "Silvercrest Webcam 1.3mpix",
.tuner_type = TUNER_ABSENT,
.is_webcam = 1,
- .no_audio = 1,
.input = { {
.type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0,
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c
index 1b9a0953e..89026a0d8 100644
--- a/linux/drivers/media/video/em28xx/em28xx-core.c
+++ b/linux/drivers/media/video/em28xx/em28xx-core.c
@@ -498,7 +498,7 @@ int em28xx_audio_setup(struct em28xx *dev)
/* If device doesn't support Usb Audio Class, use vendor class */
if (!dev->has_audio_class)
- dev->has_alsa_audio = ~dev->board.no_audio;
+ dev->has_alsa_audio = 1;
dev->audio_mode.has_audio = 1;
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h
index 67d220e3e..ccd1d15d8 100644
--- a/linux/drivers/media/video/em28xx/em28xx.h
+++ b/linux/drivers/media/video/em28xx/em28xx.h
@@ -401,7 +401,6 @@ struct em28xx_board {
unsigned int has_dvb:1;
unsigned int has_snapshot_button:1;
unsigned int is_webcam:1;
- unsigned int no_audio:1;
unsigned int valid:1;
unsigned int has_ir_i2c:1;