Fixes for 4.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.4/iio-sca3000-remove-an-erroneous-get_device.patch b/queue-4.4/iio-sca3000-remove-an-erroneous-get_device.patch
new file mode 100644 (file)
index 0000000..e649840
--- /dev/null
+++ b/queue-4.4/iio-sca3000-remove-an-erroneous-get_device.patch
@@ -0,0 +1,40 @@
+From 5841996c58434068ad74d68c9d00ac284305330e Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 6 May 2020 05:52:06 +0200
+Subject: iio: sca3000: Remove an erroneous 'get_device()'
+
+From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
+
+[ Upstream commit 928edefbc18cd8433f7df235c6e09a9306e7d580 ]
+
+This looks really unusual to have a 'get_device()' hidden in a 'dev_err()'
+call.
+Remove it.
+
+While at it add a missing \n at the end of the message.
+
+Fixes: 574fb258d636 ("Staging: IIO: VTI sca3000 series accelerometer driver (spi)")
+Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
+Cc: <Stable@vger.kernel.org>
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/staging/iio/accel/sca3000_ring.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c
+index 20b878d35ea2..fc8b6f179ec6 100644
+--- a/drivers/staging/iio/accel/sca3000_ring.c
++++ b/drivers/staging/iio/accel/sca3000_ring.c
+@@ -56,7 +56,7 @@ static int sca3000_read_data(struct sca3000_state *st,
+       st->tx[0] = SCA3000_READ_REG(reg_address_high);
+       ret = spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
+       if (ret) {
+-              dev_err(get_device(&st->us->dev), "problem reading register");
++              dev_err(&st->us->dev, "problem reading register");
+               goto error_free_rx;
+       }
+ 
+-- 
+2.25.1
+

diff --git a/queue-4.4/series b/queue-4.4/series
index cccd708a9cf5a2a0da838f816b886d4fc9c5f4c3..6bf06cc5957811015696f412cfc2cb5a42b19412 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -35,3 +35,4 @@ edac-ghes-use-cper-module-handles-to-locate-dimms.patch
 revert-gfs2-don-t-demote-a-glock-until-its-revokes-a.patch
 staging-iio-ad2s1210-fix-spi-reading.patch
 mei-release-me_cl-object-reference.patch
+iio-sca3000-remove-an-erroneous-get_device.patch