diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-19 08:45:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-19 08:45:26 -0300 |
| commit | 43ea66b6132f9d32464c11b15d5c5b190312d093 (patch) | |
| tree | 0e8c9d0d0824e2ccbf37d66d6cf4fb1c50ed061e /linux | |
| parent | 5a53a1db6f05ad25ebf05360a60e44c0773ca36e (diff) | |
| download | mediapointer-dvb-s2-43ea66b6132f9d32464c11b15d5c5b190312d093.tar.gz mediapointer-dvb-s2-43ea66b6132f9d32464c11b15d5c5b190312d093.tar.bz2 | |
Revert changeset fe5eeff6644d
From: Mauro Carvalho Chehab <mchehab@redhat.com>
This change is not needed, since the config register reurns 0 for the
audio config, and the code already disables audio in this case.
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-core.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx.h | 1 |
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; |