Merge tag 'pm+acpi-fixes-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / iio / buffer_cb.c

diff --git a/drivers/iio/buffer_cb.c b/drivers/iio/buffer_cb.c
index 4d40e24f372149cddacc4efcdc31c773c2c5d14d..9201022945e966719c4322e9242d0582316a9eee 100644 (file)
--- a/drivers/iio/buffer_cb.c
+++ b/drivers/iio/buffer_cb.c
@@ -25,7 +25,7 @@ static struct iio_buffer_access_funcs iio_cb_access = {
        .store_to = &iio_buffer_cb_store_to,
 };
 
-struct iio_cb_buffer *iio_channel_get_all_cb(const char *name,
+struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
                                             int (*cb)(u8 *data,
                                                       void *private),
                                             void *private)
@@ -46,7 +46,7 @@ struct iio_cb_buffer *iio_channel_get_all_cb(const char *name,
        cb_buff->buffer.access = &iio_cb_access;
        INIT_LIST_HEAD(&cb_buff->buffer.demux_list);
 
-       cb_buff->channels = iio_channel_get_all(name);
+       cb_buff->channels = iio_channel_get_all(dev);
        if (IS_ERR(cb_buff->channels)) {
                ret = PTR_ERR(cb_buff->channels);
                goto error_free_cb_buff;