From 2ba9f738980a6389ff6cf38866912755a9854dc9 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Tue, 4 Dec 2007 23:45:05 -0800 Subject: [PATCH] --- yaml --- r: 74583 b: refs/heads/master c: 372a302e9a892229206aafca0352584a745bc5f3 h: refs/heads/master i: 74581: 66a98012324e1b63b15062ac95d1c92f0c43f6c0 74579: e352b06d09a2822cf2295374768c08d889ef69a9 74575: 1700f1633cc5bc7bb991fcd4758ea0e2cb33a0fe v: v3 --- [refs] | 2 +- trunk/drivers/rtc/interface.c | 4 ++-- trunk/drivers/rtc/rtc-dev.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d353c6b52f77..f77ae7bb9856 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5cd17569fd0eeca510735e63a6061291e3971bf6 +refs/heads/master: 372a302e9a892229206aafca0352584a745bc5f3 diff --git a/trunk/drivers/rtc/interface.c b/trunk/drivers/rtc/interface.c index a4f56e95cf96..f1e00ff54ce8 100644 --- a/trunk/drivers/rtc/interface.c +++ b/trunk/drivers/rtc/interface.c @@ -293,7 +293,7 @@ int rtc_irq_register(struct rtc_device *rtc, struct rtc_task *task) return -EINVAL; /* Cannot register while the char dev is in use */ - if (test_and_set_bit(RTC_DEV_BUSY, &rtc->flags)) + if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags)) return -EBUSY; spin_lock_irq(&rtc->irq_task_lock); @@ -303,7 +303,7 @@ int rtc_irq_register(struct rtc_device *rtc, struct rtc_task *task) } spin_unlock_irq(&rtc->irq_task_lock); - clear_bit(RTC_DEV_BUSY, &rtc->flags); + clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); return retval; } diff --git a/trunk/drivers/rtc/rtc-dev.c b/trunk/drivers/rtc/rtc-dev.c index ae1bf177d625..025c60a17a4a 100644 --- a/trunk/drivers/rtc/rtc-dev.c +++ b/trunk/drivers/rtc/rtc-dev.c @@ -26,7 +26,7 @@ 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(RTC_DEV_BUSY, &rtc->flags)) + if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags)) return -EBUSY; file->private_data = rtc; @@ -41,7 +41,7 @@ static int rtc_dev_open(struct inode *inode, struct file *file) } /* something has gone wrong */ - clear_bit(RTC_DEV_BUSY, &rtc->flags); + clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); return err; } @@ -402,7 +402,7 @@ static int rtc_dev_release(struct inode *inode, struct file *file) if (rtc->ops->release) rtc->ops->release(rtc->dev.parent); - clear_bit(RTC_DEV_BUSY, &rtc->flags); + clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); return 0; }