summaryrefslogtreecommitdiffstats
path: root/drivers/iio/dac/mcp4725.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-07 17:34:04 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-07 17:34:04 -0800
commit5ba907a949562cd4839b0170a13dda6841055e70 (patch)
tree32d7ab834753779d3e1216a3a251c8c2fb097438 /drivers/iio/dac/mcp4725.c
parentabb4f8addf1d55f3a63ac84e3d9f609f97e5b9a0 (diff)
parent388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95 (diff)
downloadlinux-5ba907a949562cd4839b0170a13dda6841055e70.tar.bz2
Merge 4.5-rc3 into staging-next
We want the upstream staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/dac/mcp4725.c')
-rw-r--r--drivers/iio/dac/mcp4725.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c
index fb4b3364d8e0..cca935c06f2b 100644
--- a/drivers/iio/dac/mcp4725.c
+++ b/drivers/iio/dac/mcp4725.c
@@ -346,6 +346,7 @@ static int mcp4725_probe(struct i2c_client *client,
data->client = client;
indio_dev->dev.parent = &client->dev;
+ indio_dev->name = id->name;
indio_dev->info = &mcp4725_info;
indio_dev->channels = &mcp472x_channel[id->driver_data];
indio_dev->num_channels = 1;