Merge commit 'sparc-current/master'

0fb08171 · Stephen Rothwell · 00321378 · 25712efa · 0fb08171
Commit 0fb08171 authored Sep 16, 2009 by Stephen Rothwell
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

arch/sparc/kernel/time_32.c arch/sparc/kernel/time_32.c +4 -0

No files found.
--- a/arch/sparc/kernel/time_32.c
+++ b/arch/sparc/kernel/time_32.c
@@ -156,6 +156,10 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
 	if (!model)
 		return -ENODEV;

+	/* Only the primary RTC has an address property */
+	if (!of_find_property(dp, "address", NULL))
+		return -ENODEV;
+
 	m48t59_rtc.resource = &op->resource[0];
 	if (!strcmp(model, "mk48t02")) {
 		/* Map the clock register io area read-only */