From: Sasha Levin Date: Mon, 25 May 2020 20:56:04 +0000 (-0400) Subject: Fixes for 4.9 X-Git-Tag: v4.4.225~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ebbb4385c0bd61d044d3275620cf3a32e6b2063d;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/iio-sca3000-remove-an-erroneous-get_device.patch b/queue-4.9/iio-sca3000-remove-an-erroneous-get_device.patch new file mode 100644 index 00000000000..175c388a1b2 --- /dev/null +++ b/queue-4.9/iio-sca3000-remove-an-erroneous-get_device.patch @@ -0,0 +1,40 @@ +From b781891e8d7bf3565494916839c0bdf9d84a4d09 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 May 2020 05:52:06 +0200 +Subject: iio: sca3000: Remove an erroneous 'get_device()' + +From: Christophe JAILLET + +[ 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 +Cc: +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + 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 d1cb9b9cf22b..391cbcc4ed77 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.9/series b/queue-4.9/series index 23f39d873c7..213b022fb52 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -62,3 +62,4 @@ staging-greybus-fix-uninitialized-scalar-variable.patch iio-dac-vf610-fix-an-error-handling-path-in-vf610_dac_probe.patch mei-release-me_cl-object-reference.patch rapidio-fix-an-error-in-get_user_pages_fast-error-handling.patch +iio-sca3000-remove-an-erroneous-get_device.patch