aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/magnetometer
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-04-15 13:55:56 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-25 20:23:09 -0400
commit6f7c8ee585e9db54cb29af1bdb93f29837824933 (patch)
tree2eaf2ef782137ed1b9996c0fd511c40f1efb6625 /drivers/staging/iio/magnetometer
parentb428173316dcb4a518ee22c642671ae8a4bcec48 (diff)
staging:iio: Add ability to allocate private data space to iio_allocate_device
Suggested by Arnd Bergmann. Note this will break ALL drivers that are out of mainline. The fix is trivial change of iio_allocate_device() -> iio_allocate_device(0) Sorry if this causes issues for any one! V2: Include new drivers in the update Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/magnetometer')
-rw-r--r--drivers/staging/iio/magnetometer/ak8975.c2
-rw-r--r--drivers/staging/iio/magnetometer/hmc5843.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c
index d71904a8370..2226b88882d 100644
--- a/drivers/staging/iio/magnetometer/ak8975.c
+++ b/drivers/staging/iio/magnetometer/ak8975.c
@@ -526,7 +526,7 @@ static int ak8975_probe(struct i2c_client *client,
526 } 526 }
527 527
528 /* Register with IIO */ 528 /* Register with IIO */
529 data->indio_dev = iio_allocate_device(); 529 data->indio_dev = iio_allocate_device(0);
530 if (data->indio_dev == NULL) { 530 if (data->indio_dev == NULL) {
531 err = -ENOMEM; 531 err = -ENOMEM;
532 goto exit_gpio; 532 goto exit_gpio;
diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index 51689177e00..d0676e99f15 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -552,7 +552,7 @@ static int hmc5843_probe(struct i2c_client *client,
552 /* Initialize the HMC5843 chip */ 552 /* Initialize the HMC5843 chip */
553 hmc5843_init_client(client); 553 hmc5843_init_client(client);
554 554
555 data->indio_dev = iio_allocate_device(); 555 data->indio_dev = iio_allocate_device(0);
556 if (!data->indio_dev) { 556 if (!data->indio_dev) {
557 err = -ENOMEM; 557 err = -ENOMEM;
558 goto exit_free1; 558 goto exit_free1;