Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 336831
b: refs/heads/master
c: 8754fcc
h: refs/heads/master
i:
  336829: 4c5276b
  336827: 4b05dd8
  336823: f9b02f6
  336815: 77fb1bd
  336799: f815129
  336767: 2bedc83
v: v3
  • Loading branch information
Roland Stigge authored and Linus Walleij committed Nov 17, 2012
1 parent e691a04 commit 2686a79
Show file tree
Hide file tree
Showing 2 changed files with 7 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: 9859eb99e9212339e2009b98c396b08260276edf
refs/heads/master: 8754fccbae661a0020923cffd63e21de36d51e2e
12 changes: 6 additions & 6 deletions trunk/drivers/gpio/gpio-max730x.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,26 +167,26 @@ int __devinit __max730x_probe(struct max7301 *ts)
int i, ret;

pdata = dev->platform_data;
if (!pdata || !pdata->base) {
dev_err(dev, "incorrect or missing platform data\n");
return -EINVAL;
}

mutex_init(&ts->lock);
dev_set_drvdata(dev, ts);

/* Power up the chip and disable IRQ output */
ts->write(dev, 0x04, 0x01);

ts->input_pullup_active = pdata->input_pullup_active;
if (pdata) {
ts->input_pullup_active = pdata->input_pullup_active;
ts->chip.base = pdata->base;
} else {
ts->chip.base = -1;
}
ts->chip.label = dev->driver->name;

ts->chip.direction_input = max7301_direction_input;
ts->chip.get = max7301_get;
ts->chip.direction_output = max7301_direction_output;
ts->chip.set = max7301_set;

ts->chip.base = pdata->base;
ts->chip.ngpio = PIN_NUMBER;
ts->chip.can_sleep = 1;
ts->chip.dev = dev;
Expand Down

0 comments on commit 2686a79

Please sign in to comment.