Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268731
b: refs/heads/master
c: 72a86cc
h: refs/heads/master
i:
  268729: 784930b
  268727: 0369800
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Oct 5, 2011
1 parent 0226095 commit 29b3537
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 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: 4a70513074091e814fd5444c75f572691b7ba588
refs/heads/master: 72a86ccd3a4b60dacddc97095e13f32ee6117314
5 changes: 2 additions & 3 deletions trunk/drivers/staging/iio/resolver/ad2s90.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

struct ad2s90_state {
struct mutex lock;
struct iio_dev *idev;
struct spi_device *sdev;
u8 rx[2] ____cacheline_aligned;
};
Expand Down Expand Up @@ -87,7 +86,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi)
indio_dev->info = &ad2s90_info;
indio_dev->modes = INDIO_DIRECT_MODE;

ret = iio_device_register(st->idev);
ret = iio_device_register(indio_dev);
if (ret)
goto error_free_dev;

Expand All @@ -99,7 +98,7 @@ static int __devinit ad2s90_probe(struct spi_device *spi)
return 0;

error_free_dev:
iio_free_device(st->idev);
iio_free_device(indio_dev);
error_ret:
return ret;
}
Expand Down

0 comments on commit 29b3537

Please sign in to comment.