diff --git a/[refs] b/[refs] index 585602fb34ec..c7ca35dfec46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e69ab1361c44e3ee1398158b56d114b1aef8179 +refs/heads/master: 2e2a0f6ed1637e8cc4c33850bdf51a418d516157 diff --git a/trunk/drivers/pwm/pwm-twl-led.c b/trunk/drivers/pwm/pwm-twl-led.c index 9dfa0f3eca30..83e25d45d640 100644 --- a/trunk/drivers/pwm/pwm-twl-led.c +++ b/trunk/drivers/pwm/pwm-twl-led.c @@ -300,6 +300,7 @@ static int twl_pwmled_probe(struct platform_device *pdev) twl->chip.dev = &pdev->dev; twl->chip.base = -1; + twl->chip.can_sleep = true; mutex_init(&twl->mutex); diff --git a/trunk/drivers/pwm/pwm-twl.c b/trunk/drivers/pwm/pwm-twl.c index e65db95d5e59..f783efcd14bb 100644 --- a/trunk/drivers/pwm/pwm-twl.c +++ b/trunk/drivers/pwm/pwm-twl.c @@ -315,6 +315,7 @@ static int twl_pwm_probe(struct platform_device *pdev) twl->chip.dev = &pdev->dev; twl->chip.base = -1; twl->chip.npwm = 2; + twl->chip.can_sleep = true; mutex_init(&twl->mutex);