iio: fix iio channel get issue

We should fall back to get the channel by consumer_dev_name, if there is no
channel name on device node in device tree.

Change-Id: I5ee9147c991f5812a97d676d78299a8fcc0205cc
Signed-off-by: wahsu <wahsu@nvidia.com>
Reviewed-on: http://git-master/r/385560
Reviewed-by: Robert Shih <rshih@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index 8b3be9223bcb74b9d69512c6f670da0563e25b9b..992d50e27a247d89ded3f138c710bbff534b30a6 100644 (file)
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -314,7 +314,7 @@ struct iio_channel *iio_channel_get(struct device *dev,
        if (dev) {
                channel = of_iio_channel_get_by_name(dev->of_node,
                                                     channel_name);
-               if (channel != NULL)
+               if ((channel != NULL) && (!IS_ERR(channel)))
                        return channel;
        }
        return iio_channel_get_sys(name, channel_name);