diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-18 11:03:57 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-18 11:03:57 +0300 |
| commit | 061f817eb6a6f97a7e34b73e5e80baa3a20b7663 (patch) | |
| tree | 412332269985de14d5e1ae9eedbfcd73bc635e97 /drivers/iio/dac/mcp4725.c | |
| parent | e6c8f1873be8a14c7e44202df1f7e6ea61bf3352 (diff) | |
| parent | 18558cae0272f8fd9647e69d3fec1565a7949865 (diff) | |
| download | linux-061f817eb6a6f97a7e34b73e5e80baa3a20b7663.tar.xz | |
Merge tag 'v4.5-rc4' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iio/dac/mcp4725.c')
| -rw-r--r-- | drivers/iio/dac/mcp4725.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c index 43d14588448d..b4dde8315210 100644 --- a/drivers/iio/dac/mcp4725.c +++ b/drivers/iio/dac/mcp4725.c @@ -300,6 +300,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 = &mcp4725_channel; indio_dev->num_channels = 1; |