From: Hans Verkuil Date: Tue, 27 Aug 2013 07:27:57 +0000 (-0300) Subject: [media] cx88: Fix regression: CX88_AUDIO_WM8775 can't be 0 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f66b2a1c7f2ae3fb0d5b67d07ab4f5055fd3cf16;p=linux-beck.git [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 Reported-by: Knut Petersen Tested-by: Knut Petersen Signed-off-by: Mauro Carvalho Chehab Cc: stable@vger.kernel.org --- 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, };