git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
rtc
/
rtc-proc.c
diff --git
a/drivers/rtc/rtc-proc.c
b/drivers/rtc/rtc-proc.c
index
cef5f5a
..
c272afd
100644
(file)
--- a/
drivers/rtc/rtc-proc.c
+++ b/
drivers/rtc/rtc-proc.c
@@
-23,7
+23,7
@@
static int rtc_proc_show(struct seq_file *seq, void *offset)
{
int err;
struct class_device *class_dev = seq->private;
{
int err;
struct class_device *class_dev = seq->private;
- struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops;
+
const
struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops;
struct rtc_wkalrm alrm;
struct rtc_time tm;
struct rtc_wkalrm alrm;
struct rtc_time tm;
@@
-61,11
+61,11
@@
static int rtc_proc_show(struct seq_file *seq, void *offset)
seq_printf(seq, "%02d-", alrm.time.tm_mon + 1);
else
seq_printf(seq, "**-");
seq_printf(seq, "%02d-", alrm.time.tm_mon + 1);
else
seq_printf(seq, "**-");
- if ((unsigned int)alrm.time.tm_mday <= 31)
+ if (
alrm.time.tm_mday &&
(unsigned int)alrm.time.tm_mday <= 31)
seq_printf(seq, "%02d\n", alrm.time.tm_mday);
else
seq_printf(seq, "**\n");
seq_printf(seq, "%02d\n", alrm.time.tm_mday);
else
seq_printf(seq, "**\n");
- seq_printf(seq, "al
rm_wakeup
\t: %s\n",
+ seq_printf(seq, "al
arm_IRQ
\t: %s\n",
alrm.enabled ? "yes" : "no");
seq_printf(seq, "alrm_pending\t: %s\n",
alrm.pending ? "yes" : "no");
alrm.enabled ? "yes" : "no");
seq_printf(seq, "alrm_pending\t: %s\n",
alrm.pending ? "yes" : "no");
@@
-120,7
+120,7
@@
static int rtc_proc_add_device(struct class_device *class_dev,
ent->owner = rtc->owner;
ent->data = class_dev;
ent->owner = rtc->owner;
ent->data = class_dev;
- dev_
info
(class_dev->dev, "rtc intf: proc\n");
+ dev_
dbg
(class_dev->dev, "rtc intf: proc\n");
}
else
rtc_dev = NULL;
}
else
rtc_dev = NULL;
@@
-156,7
+156,7
@@
static void __exit rtc_proc_exit(void)
class_interface_unregister(&rtc_proc_interface);
}
class_interface_unregister(&rtc_proc_interface);
}
-
module_init
(rtc_proc_init);
+
subsys_initcall
(rtc_proc_init);
module_exit(rtc_proc_exit);
MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
module_exit(rtc_proc_exit);
MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");