Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatchin...

[linux-2.6-microblaze.git] / drivers / iio / dac / ad5360.c

diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c
index 3e0c9e8..602dd2b 100644 (file)
--- a/drivers/iio/dac/ad5360.c
+++ b/drivers/iio/dac/ad5360.c
@@ -67,7 +67,7 @@ struct ad5360_chip_info {
  * @chip_info:         chip model specific constants, available modes etc
  * @vref_reg:          vref supply regulators
  * @ctrl:              control register cache
- * @lock               lock to protect the data buffer during SPI ops
+ * @lock:              lock to protect the data buffer during SPI ops
  * @data:              spi transfer buffers
  */
 
@@ -476,7 +476,6 @@ static int ad5360_probe(struct spi_device *spi)
        st->chip_info = &ad5360_chip_info_tbl[type];
        st->spi = spi;
 
-       indio_dev->dev.parent = &spi->dev;
        indio_dev->name = spi_get_device_id(spi)->name;
        indio_dev->info = &ad5360_info;
        indio_dev->modes = INDIO_DIRECT_MODE;