diff --git a/[refs] b/[refs]
index 0aabedfc47ab..76ca5385bd0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b014a30c5991e67aa90b6ff9bd4ec16435bbcefd
+refs/heads/master: c8e4df3109646762f21c6e288187ec395fdf67be
diff --git a/trunk/drivers/pwm/pwm-twl.c b/trunk/drivers/pwm/pwm-twl.c
index ee7fa5ddba5d..2782001ba183 100644
--- a/trunk/drivers/pwm/pwm-twl.c
+++ b/trunk/drivers/pwm/pwm-twl.c
@@ -248,7 +248,7 @@ static int twl6030_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 	twl->twl6030_toggle3 = val;
 out:
 	mutex_unlock(&twl->mutex);
-	return 0;
+	return ret;
 }
 
 static void twl6030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)