Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 93440
b: refs/heads/master
c: 21dbfd2
h: refs/heads/master
v: v3
  • Loading branch information
Remi Machet authored and Paul Mackerras committed Apr 24, 2008
1 parent 794c84f commit 81c69d6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 839ad62e75ee1968438d1b72261304cd47fc961e
refs/heads/master: 21dbfd291fe704986fab63a129f89ed2de471329
10 changes: 4 additions & 6 deletions trunk/arch/powerpc/sysdev/mv64x60_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down

0 comments on commit 81c69d6

Please sign in to comment.