lkml.org 
[lkml]   [2010]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [175/223] backlight: grab ops_lock before testing bd->ops
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>

    commit d1d73578e053b981c3611e5a211534290d24a5eb upstream.

    According to the comment describing ops_lock in the definition of struct
    backlight_device and when comparing with other functions in backlight.c
    the mutex must be hold when checking ops to be non-NULL.

    Fixes a problem added by c835ee7f4154992e6 ("backlight: Add suspend/resume
    support to the backlight core") in Jan 2009.

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Richard Purdie <rpurdie@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    drivers/video/backlight/backlight.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    Index: linux/drivers/video/backlight/backlight.c
    ===================================================================
    --- linux.orig/drivers/video/backlight/backlight.c
    +++ linux/drivers/video/backlight/backlight.c
    @@ -197,12 +197,12 @@ static int backlight_suspend(struct devi
    {
    struct backlight_device *bd = to_backlight_device(dev);

    - if (bd->ops->options & BL_CORE_SUSPENDRESUME) {
    - mutex_lock(&bd->ops_lock);
    + mutex_lock(&bd->ops_lock);
    + if (bd->ops && bd->ops->options & BL_CORE_SUSPENDRESUME) {
    bd->props.state |= BL_CORE_SUSPENDED;
    backlight_update_status(bd);
    - mutex_unlock(&bd->ops_lock);
    }
    + mutex_unlock(&bd->ops_lock);

    return 0;
    }
    @@ -211,12 +211,12 @@ static int backlight_resume(struct devic
    {
    struct backlight_device *bd = to_backlight_device(dev);

    - if (bd->ops->options & BL_CORE_SUSPENDRESUME) {
    - mutex_lock(&bd->ops_lock);
    + mutex_lock(&bd->ops_lock);
    + if (bd->ops && bd->ops->options & BL_CORE_SUSPENDRESUME) {
    bd->props.state &= ~BL_CORE_SUSPENDED;
    backlight_update_status(bd);
    - mutex_unlock(&bd->ops_lock);
    }
    + mutex_unlock(&bd->ops_lock);

    return 0;
    }
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2010-12-13 00:59    [W:2.897 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site