diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-14 16:59:40 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-14 16:59:40 -0800 |
| commit | 8fcacc0344e6d49c8305a146ca4c62a9a654adaa (patch) | |
| tree | 43fdca5c5f33e28a25d8dc335e59d282fd540bad | |
| parent | 7f4c977849d494a1ff173fbc226b69192ec02c90 (diff) | |
| parent | 43675ffafd3c3373f82691f539df3dc7403877fe (diff) | |
| download | blackbird-obmc-linux-8fcacc0344e6d49c8305a146ca4c62a9a654adaa.tar.gz blackbird-obmc-linux-8fcacc0344e6d49c8305a146ca4c62a9a654adaa.zip | |
Merge tag 'sunxi-fixes-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes
Merge "Allwinner fixes for 4.4" from Maxime Ripard:
Allwinner fixes for 4.4
Two patches, one to fix the touchscreen axis on one Allwinner board, and
the other one fixing a mutex unlocking issue on one error path in the RSB
driver.
* tag 'sunxi-fixes-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
bus: sunxi-rsb: unlock on error in sunxi_rsb_read()
ARM: dts: sunxi: sun6i-a31s-primo81.dts: add touchscreen axis swapping property
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31s-primo81.dts | 1 | ||||
| -rw-r--r-- | drivers/bus/sunxi-rsb.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts index 2d4250b1faf8..68b479b8772c 100644 --- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts +++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts @@ -83,6 +83,7 @@ reg = <0x5d>; interrupt-parent = <&pio>; interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */ + touchscreen-swapped-x-y; }; }; diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c index 846bc29c157d..0cfcb39c53f4 100644 --- a/drivers/bus/sunxi-rsb.c +++ b/drivers/bus/sunxi-rsb.c @@ -342,13 +342,13 @@ static int sunxi_rsb_read(struct sunxi_rsb *rsb, u8 rtaddr, u8 addr, ret = _sunxi_rsb_run_xfer(rsb); if (ret) - goto out; + goto unlock; *buf = readl(rsb->regs + RSB_DATA); +unlock: mutex_unlock(&rsb->lock); -out: return ret; } |
