Merge commit 'v2.6.27-rc6' into x86/pat

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 35dcc06eb3e2..f118252f3a9f 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -403,11 +403,14 @@ static long rtc_dev_ioctl(struct file *file,
 
 #ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL
         case RTC_UIE_OFF:
+                mutex_unlock(&rtc->ops_lock);
                 clear_uie(rtc);
-                break;
+                return 0;
 
         case RTC_UIE_ON:
+                mutex_unlock(&rtc->ops_lock);
                 err = set_uie(rtc);
+                return err;
 #endif
         default:
                 err = -ENOTTY;