From cb3a58d2acc042f62cde932add8e1f9ed508368d Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 8 May 2007 00:33:46 -0700 Subject: rtc: update to class device removal patches Fix a goof in the revised classdev support for RTCs: make sure the /dev node info is ready before the device is registered, not after. Otherwise the /sys/class/rtc/rtcN/dev attribute won't be created and then udev won't have the information it needs to create the /dev/rtcN node. Signed-off-by: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/rtc/rtc-dev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers/rtc/rtc-dev.c') diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index 2c13433089a..671b14ec28b 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c @@ -396,7 +396,7 @@ static const struct file_operations rtc_dev_fops = { /* insertion/removal hooks */ -void rtc_dev_add_device(struct rtc_device *rtc) +void rtc_dev_prepare(struct rtc_device *rtc) { if (!rtc_devt) return; @@ -418,7 +418,10 @@ void rtc_dev_add_device(struct rtc_device *rtc) cdev_init(&rtc->char_dev, &rtc_dev_fops); rtc->char_dev.owner = rtc->owner; +} +void rtc_dev_add_device(struct rtc_device *rtc) +{ if (cdev_add(&rtc->char_dev, rtc->dev.devt, 1)) printk(KERN_WARNING "%s: failed to add char device %d:%d\n", rtc->name, MAJOR(rtc_devt), rtc->id); -- cgit v1.2.3-70-g09d2