Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164540
b: refs/heads/master
c: dc791f8
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Mack authored and Linus Torvalds committed Sep 22, 2009
1 parent 66fbe92 commit a212bf7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 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: 2cd9645e2f0d60ed12268fe1738e79c119e2fe5a
refs/heads/master: dc791f8aeeeea4314beede83d6ee74e6af5f627b
17 changes: 8 additions & 9 deletions trunk/drivers/hwmon/lis3lv02d_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,16 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
if (ret < 0)
return ret;

lis3_dev.bus_priv = spi;
lis3_dev.init = lis3_spi_init;
lis3_dev.read = lis3_spi_read;
lis3_dev.write = lis3_spi_write;
lis3_dev.irq = spi->irq;
lis3_dev.ac = lis3lv02d_axis_normal;
lis3_dev.pdata = spi->dev.platform_data;
lis3_dev.bus_priv = spi;
lis3_dev.init = lis3_spi_init;
lis3_dev.read = lis3_spi_read;
lis3_dev.write = lis3_spi_write;
lis3_dev.irq = spi->irq;
lis3_dev.ac = lis3lv02d_axis_normal;
lis3_dev.pdata = spi->dev.platform_data;
spi_set_drvdata(spi, &lis3_dev);

ret = lis3lv02d_init_device(&lis3_dev);
return ret;
return lis3lv02d_init_device(&lis3_dev);
}

static int __devexit lis302dl_spi_remove(struct spi_device *spi)
Expand Down

0 comments on commit a212bf7

Please sign in to comment.