From 42ae260b14a59bb5d26dc303c6ef96dfcbfd487f Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Thu, 15 May 2008 09:38:18 -0600 Subject: [PATCH] --- yaml --- r: 100271 b: refs/heads/master c: 51a776fa7a7997e726d4a478eda0854c6f9143bd h: refs/heads/master i: 100269: d55634ace2493dd409df7e9b5490e71e6f5f7030 100267: 5269d6e56dbe5935987bccfa94307d1fc6015f80 100263: 66fd1e14332f1b661707df87ca0103d39272f42a 100255: a70c45d3c9336532e324d8a619f6b66bfa06cdd0 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-dev.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 09b666157d92..4cd925919377 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bec0bba7a507bdaf07312fcabdc00b5576abb32 +refs/heads/master: 51a776fa7a7997e726d4a478eda0854c6f9143bd diff --git a/trunk/drivers/rtc/rtc-dev.c b/trunk/drivers/rtc/rtc-dev.c index 90dfa0df747a..0114a78b7cbb 100644 --- a/trunk/drivers/rtc/rtc-dev.c +++ b/trunk/drivers/rtc/rtc-dev.c @@ -13,6 +13,7 @@ #include #include +#include #include "rtc-core.h" static dev_t rtc_devt; @@ -26,8 +27,11 @@ static int rtc_dev_open(struct inode *inode, struct file *file) struct rtc_device, char_dev); const struct rtc_class_ops *ops = rtc->ops; - if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags)) - return -EBUSY; + lock_kernel(); + if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags)) { + err = -EBUSY; + goto out; + } file->private_data = rtc; @@ -37,11 +41,13 @@ static int rtc_dev_open(struct inode *inode, struct file *file) rtc->irq_data = 0; spin_unlock_irq(&rtc->irq_lock); - return 0; + goto out; } /* something has gone wrong */ clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); +out: + unlock_kernel(); return err; }