lkml.org 
[lkml]   [2009]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND] [PATCH] pxa2xx-ac97: fix displaying GSR after reset timeout
    Date
    the variable gsr_bit is set in isr. It is however set to 0 and interrupts are
    disabled prior to reset on pxa27x and pxa3xx. Hence it doesn't make a lot of
    sense to show the content of gsr_bit in case of a reset timeout.

    Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
    ---
    sound/arm/pxa2xx-ac97-lib.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
    index 35afd0c..25933ba 100644
    --- a/sound/arm/pxa2xx-ac97-lib.c
    +++ b/sound/arm/pxa2xx-ac97-lib.c
    @@ -218,7 +218,7 @@ bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)

    if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) {
    printk(KERN_INFO "%s: warm reset timeout (GSR=%#lx)\n",
    - __func__, gsr_bits);
    + __func__, GSR | gsr_bits);

    return false;
    }
    @@ -248,7 +248,7 @@ bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)

    if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) {
    printk(KERN_INFO "%s: cold reset timeout (GSR=%#lx)\n",
    - __func__, gsr_bits);
    + __func__, GSR | gsr_bits);

    return false;
    }
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2009-03-24 17:31    [W:0.020 / U:33.776 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site