dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

[POWERPC] Use default values if necessary in mv64x60 I2C initialization

Browse source 
I2C parameters freq_m and freq_n are assigned defaults in the code,
but if properties for those parameters are not found in the open
firmware description the init routine returns an error and doesn't
create the platform device.

This changes the code so that it doesn't return an error if the
properties are not found but instead uses the default values.

Signed-off-by: Remi Machet (rmachet@slac.stanford.edu)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Remi Machet 2008-04-22 03:36:48 +10:00 committed by Paul Mackerras
parent 839ad62e75
commit 21dbfd291f
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/powerpc/sysdev/mv64x60_dev.c
View file

@ -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 */