diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-08-27 09:27:57 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-09-03 14:24:22 +0200 |
| commit | f66b2a1c7f2ae3fb0d5b67d07ab4f5055fd3cf16 (patch) | |
| tree | 824e5b8012c50d943b5a6de1bde75c95b1a0b760 /drivers/media/pci/cx88 | |
| parent | [media] exynos4-is: Fix entity unregistration on error path (diff) | |
| download | linux-f66b2a1c7f2ae3fb0d5b67d07ab4f5055fd3cf16.tar.xz linux-f66b2a1c7f2ae3fb0d5b67d07ab4f5055fd3cf16.zip | |
[media] cx88: Fix regression: CX88_AUDIO_WM8775 can't be 0
Cards using the wm8775 specify that in their card struct. Those that do not
use it leave the audio_chip field to 0. Unfortunately, the CX88_AUDIO_WM8775
enum is 0 as well, so boards that do not have the wm8775 still try to load
and use that driver. Change it to 1 to fix this.
This regression was introduced in commit facd23664f1d63c33fbc6da52261c8548ed3fbd4.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
Tested-by: Knut Petersen <Knut_Petersen@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/media/pci/cx88')
| -rw-r--r-- | drivers/media/pci/cx88/cx88.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h index afe0eaea81b4..28893a6b249e 100644 --- a/drivers/media/pci/cx88/cx88.h +++ b/drivers/media/pci/cx88/cx88.h @@ -259,7 +259,7 @@ struct cx88_input { }; enum cx88_audio_chip { - CX88_AUDIO_WM8775, + CX88_AUDIO_WM8775 = 1, CX88_AUDIO_TVAUDIO, }; |