diff options
Diffstat (limited to 'drivers/rtc/rtc-dev.c')
-rw-r--r-- | drivers/rtc/rtc-dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index ae1bf177d625..025c60a17a4a 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c | |||
@@ -26,7 +26,7 @@ static int rtc_dev_open(struct inode *inode, struct file *file) | |||
26 | struct rtc_device, char_dev); | 26 | struct rtc_device, char_dev); |
27 | const struct rtc_class_ops *ops = rtc->ops; | 27 | const struct rtc_class_ops *ops = rtc->ops; |
28 | 28 | ||
29 | if (test_and_set_bit(RTC_DEV_BUSY, &rtc->flags)) | 29 | if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags)) |
30 | return -EBUSY; | 30 | return -EBUSY; |
31 | 31 | ||
32 | file->private_data = rtc; | 32 | file->private_data = rtc; |
@@ -41,7 +41,7 @@ static int rtc_dev_open(struct inode *inode, struct file *file) | |||
41 | } | 41 | } |
42 | 42 | ||
43 | /* something has gone wrong */ | 43 | /* something has gone wrong */ |
44 | clear_bit(RTC_DEV_BUSY, &rtc->flags); | 44 | clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); |
45 | return err; | 45 | return err; |
46 | } | 46 | } |
47 | 47 | ||
@@ -402,7 +402,7 @@ static int rtc_dev_release(struct inode *inode, struct file *file) | |||
402 | if (rtc->ops->release) | 402 | if (rtc->ops->release) |
403 | rtc->ops->release(rtc->dev.parent); | 403 | rtc->ops->release(rtc->dev.parent); |
404 | 404 | ||
405 | clear_bit(RTC_DEV_BUSY, &rtc->flags); | 405 | clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); |
406 | return 0; | 406 | return 0; |
407 | } | 407 | } |
408 | 408 | ||