Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/iio/adc/mcp3422.c | 4 +++-
+ drivers/iio/adc/mcp3422.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
-index 63de705086ed4..155db438b7ecb 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
-@@ -148,8 +148,10 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
+@@ -146,8 +146,10 @@ static int mcp3422_read_channel(struct m
config &= ~MCP3422_PGA_MASK;
config |= MCP3422_PGA_VALUE(adc->pga[req_channel]);
ret = mcp3422_update_config(adc, config);
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
---
-2.25.1
-
if (req_channel != MCP3422_CHANNEL(adc->config)) {
config = adc->config;
config &= ~MCP3422_CHANNEL_MASK;
-@@ -155,7 +153,11 @@ static int mcp3422_read_channel(struct m
+@@ -153,7 +151,11 @@ static int mcp3422_read_channel(struct m
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/iio/adc/mcp3422.c | 4 +++-
+ drivers/iio/adc/mcp3422.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
-index 819f260115005..a5a687257c0b8 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
-@@ -148,8 +148,10 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
+@@ -146,8 +146,10 @@ static int mcp3422_read_channel(struct m
config &= ~MCP3422_PGA_MASK;
config |= MCP3422_PGA_VALUE(adc->pga[req_channel]);
ret = mcp3422_update_config(adc, config);
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
---
-2.25.1
-
if (req_channel != MCP3422_CHANNEL(adc->config)) {
config = adc->config;
config &= ~MCP3422_CHANNEL_MASK;
-@@ -155,7 +153,11 @@ static int mcp3422_read_channel(struct m
+@@ -153,7 +151,11 @@ static int mcp3422_read_channel(struct m
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/iio/adc/mcp3422.c | 4 +++-
+ drivers/iio/adc/mcp3422.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
-index 3555122008b44..21f37da8ba3d7 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
-@@ -147,8 +147,10 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
+@@ -145,8 +145,10 @@ static int mcp3422_read_channel(struct m
config &= ~MCP3422_PGA_MASK;
config |= MCP3422_PGA_VALUE(adc->pga[req_channel]);
ret = mcp3422_update_config(adc, config);
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
---
-2.25.1
-
if (req_channel != MCP3422_CHANNEL(adc->config)) {
config = adc->config;
config &= ~MCP3422_CHANNEL_MASK;
-@@ -154,7 +152,11 @@ static int mcp3422_read_channel(struct m
+@@ -152,7 +150,11 @@ static int mcp3422_read_channel(struct m
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/iio/adc/mcp3422.c | 4 +++-
+ drivers/iio/adc/mcp3422.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
-index 254135e077922..25f3e58cd4d05 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
-@@ -148,8 +148,10 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
+@@ -146,8 +146,10 @@ static int mcp3422_read_channel(struct m
config &= ~MCP3422_PGA_MASK;
config |= MCP3422_PGA_VALUE(adc->pga[req_channel]);
ret = mcp3422_update_config(adc, config);
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
---
-2.25.1
-
if (req_channel != MCP3422_CHANNEL(adc->config)) {
config = adc->config;
config &= ~MCP3422_CHANNEL_MASK;
-@@ -155,7 +153,11 @@ static int mcp3422_read_channel(struct m
+@@ -153,7 +151,11 @@ static int mcp3422_read_channel(struct m
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/iio/adc/mcp3422.c | 4 +++-
+ drivers/iio/adc/mcp3422.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
-index d86c0b5d80a3d..c717981c8fb03 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
-@@ -145,8 +145,10 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
+@@ -143,8 +143,10 @@ static int mcp3422_read_channel(struct m
config &= ~MCP3422_PGA_MASK;
config |= MCP3422_PGA_VALUE(adc->pga[req_channel]);
ret = mcp3422_update_config(adc, config);
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
---
-2.25.1
-
if (req_channel != MCP3422_CHANNEL(adc->config)) {
config = adc->config;
config &= ~MCP3422_CHANNEL_MASK;
-@@ -152,7 +150,11 @@ static int mcp3422_read_channel(struct m
+@@ -150,7 +148,11 @@ static int mcp3422_read_channel(struct m
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}