lkml.org 
[lkml]   [2012]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[03/27] ALSA: ice1724 - Check for ac97 to avoid kernel oops
    2.6.32-longterm review patch.  If anyone has any objections, please let me know.

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

    From: Pavel Hofman <pavel.hofman@ivitera.com>

    commit e7848163aa2a649d9065f230fadff80dc3519775 upstream.

    Cards with identical PCI ids but no AC97 config in EEPROM do not have
    the ac97 field initialized. We must check for this case to avoid kernel oops.

    Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/pci/ice1712/amp.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/sound/pci/ice1712/amp.c
    +++ b/sound/pci/ice1712/amp.c
    @@ -69,8 +69,11 @@ static int __devinit snd_vt1724_amp_init

    static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice)
    {
    - /* we use pins 39 and 41 of the VT1616 for left and right read outputs */
    - snd_ac97_write_cache(ice->ac97, 0x5a, snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);
    + if (ice->ac97)
    + /* we use pins 39 and 41 of the VT1616 for left and right
    + read outputs */
    + snd_ac97_write_cache(ice->ac97, 0x5a,
    + snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);
    return 0;
    }




    \
     
     \ /
      Last update: 2012-01-24 00:49    [W:3.096 / U:0.660 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site