3.2.10 stable build failures?

3.2.10 stable build failures?

[Ben Guthro]

Hello - I merged the 3.2.10 stable patch set that you pushed yesterday
into my tree, but am seeing build failures that
WM1811_JACKDET_MODE_MASK is undeclared.

This looks like it originated with the following commit:

commit 315e73b400c9a287a53efb5f857d308589674ac5
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Mon Feb 20 21:32:32 2012 +0000

    mfd: Test for jack detection when deciding if wm8994 should suspend

    commit e7c248a049c2aac21bded0b0722caee6f0e57256 upstream.

    The jack detection on WM1811 is often required during system suspend, add
    it as another check when deciding if we should suspend.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>



I've grepped the entire 3.2.10 source tree for
WM1811_JACKDET_MODE_MASK - but have only found the occurence in the if
statement introduced in the above changeset


In the mainline tree, "git blame" says this was introduced in the
following changeset to
include/linux/mfd/wm8994/registers.h

commit af6b6fe41c4bc9e7933d66bbbf5106e0e7e6e484
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Wed Nov 30 20:32:05 2011 +0000

    ASoC: Implement support for WM1811A jack detection

    The WM1811A features an advanced low power accessory detection subsystem
    which allows the device to be maintained in a very low power state while
    the system is idle without sacrificing any accessory detection features.

    Implement software support for this, automatically managing the power
    configuration of the device depending on the detected accessory.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>



Would you recommend me backporting that changeset from mainline, or
reverting the offending one?


- Ben Guthro

Re: 3.2.10 stable build failures?

[Greg KH]

On Tue, Mar 13, 2012 at 09:25:03AM -0400, Ben Guthro wrote:
> Hello - I merged the 3.2.10 stable patch set that you pushed yesterday
> into my tree, but am seeing build failures that
> WM1811_JACKDET_MODE_MASK is undeclared.
> 
> This looks like it originated with the following commit:
> 
> commit 315e73b400c9a287a53efb5f857d308589674ac5
> Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Date:   Mon Feb 20 21:32:32 2012 +0000
> 
>     mfd: Test for jack detection when deciding if wm8994 should suspend
> 
>     commit e7c248a049c2aac21bded0b0722caee6f0e57256 upstream.
> 
>     The jack detection on WM1811 is often required during system suspend, add
>     it as another check when deciding if we should suspend.
> 
>     Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
>     Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
>     Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> 
> 
> I've grepped the entire 3.2.10 source tree for
> WM1811_JACKDET_MODE_MASK - but have only found the occurence in the if
> statement introduced in the above changeset

Ugh, you are right, thanks for pointing it out to me.  My .config I test
with here didn't have that driver enabled, my appologies.

I'll go do a new release right now, reverting this patch.

Mark, if you want this patch in 3.2, please rework it and resend it to
me.

thanks,

greg k-h