diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/rtc/rtc-dev.c | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'drivers/rtc/rtc-dev.c')
| -rw-r--r-- | drivers/rtc/rtc-dev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index 079e9ed907e0..ecdea44ae4e5 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c | |||
| @@ -446,9 +446,6 @@ static int rtc_dev_release(struct inode *inode, struct file *file) | |||
| 446 | if (rtc->ops->release) | 446 | if (rtc->ops->release) |
| 447 | rtc->ops->release(rtc->dev.parent); | 447 | rtc->ops->release(rtc->dev.parent); |
| 448 | 448 | ||
| 449 | if (file->f_flags & FASYNC) | ||
| 450 | rtc_dev_fasync(-1, file, 0); | ||
| 451 | |||
| 452 | clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); | 449 | clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags); |
| 453 | return 0; | 450 | return 0; |
| 454 | } | 451 | } |