lkml.org 
[lkml]   [2013]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 087/117] media: cx88: Fix regression: CX88_AUDIO_WM8775 cant be 0
    Date
    3.11-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hans Verkuil <hans.verkuil@cisco.com>

    commit f66b2a1c7f2ae3fb0d5b67d07ab4f5055fd3cf16 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/pci/cx88/cx88.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- 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,
    };




    \
     
     \ /
      Last update: 2013-09-25 02:41    [W:4.070 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site