From 81c69d6bb1971c12e5142a58ee0ea1fba9e1d6e1 Mon Sep 17 00:00:00 2001 From: Remi Machet Date: Tue, 22 Apr 2008 03:36:48 +1000 Subject: [PATCH] --- yaml --- r: 93440 b: refs/heads/master c: 21dbfd291fe704986fab63a129f89ed2de471329 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/mv64x60_dev.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ca48e364603e..1bdc78cf2b04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 839ad62e75ee1968438d1b72261304cd47fc961e +refs/heads/master: 21dbfd291fe704986fab63a129f89ed2de471329 diff --git a/trunk/arch/powerpc/sysdev/mv64x60_dev.c b/trunk/arch/powerpc/sysdev/mv64x60_dev.c index 047b31027fa6..c8d9257f431b 100644 --- a/trunk/arch/powerpc/sysdev/mv64x60_dev.c +++ b/trunk/arch/powerpc/sysdev/mv64x60_dev.c @@ -338,15 +338,13 @@ static int __init mv64x60_i2c_device_setup(struct device_node *np, int id) pdata.freq_m = 8; /* default */ prop = of_get_property(np, "freq_m", NULL); - if (!prop) - return -ENODEV; - pdata.freq_m = *prop; + if (prop) + pdata.freq_m = *prop; pdata.freq_m = 3; /* default */ prop = of_get_property(np, "freq_n", NULL); - if (!prop) - return -ENODEV; - pdata.freq_n = *prop; + if (prop) + pdata.freq_n = *prop; pdata.timeout = 1000; /* default: 1 second */