diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 13:27:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 13:27:23 +0100 |
| commit | b00560f2d4de69bb12f66f9605985b516df98d77 (patch) | |
| tree | 0c92fc994125dc3ddb635842715be29d8b16808b /drivers/rtc/rtc-proc.c | |
| parent | bf1af3a809506645b9130755b713b008da14737f (diff) | |
| parent | 4fe757dd48a9e95e1a071291f15dda5421dacb66 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: we need to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/rtc/rtc-proc.c')
| -rw-r--r-- | drivers/rtc/rtc-proc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c index c086fc30a84c..242bbf86c74a 100644 --- a/drivers/rtc/rtc-proc.c +++ b/drivers/rtc/rtc-proc.c @@ -81,12 +81,16 @@ static int rtc_proc_show(struct seq_file *seq, void *offset) static int rtc_proc_open(struct inode *inode, struct file *file) { + int ret; struct rtc_device *rtc = PDE(inode)->data; if (!try_module_get(THIS_MODULE)) return -ENODEV; - return single_open(file, rtc_proc_show, rtc); + ret = single_open(file, rtc_proc_show, rtc); + if (ret) + module_put(THIS_MODULE); + return ret; } static int rtc_proc_release(struct inode *inode, struct file *file) |