diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 13:53:03 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 16:27:43 +0100 |
| commit | 7e20e4ab96ffc4d425fc3c6593a65d813f641fd1 (patch) | |
| tree | e5a8922efcd5dbceda05164f7736e2d89f6aeb49 /target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch | |
| parent | f7a406deafb4d2524f46a405d84a6d20c65022a9 (diff) | |
| download | upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.tar.gz upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.tar.bz2 upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.zip | |
kernel: bump 4.9 to 4.9.137
Refreshed all patches.
Removed upstreamed hunks in:
- 703-phy-support-layerscape.patch
Compile-tested on: ar71xx, layerscape
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch b/target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch index 6646d77944..0d9b165aba 100644 --- a/target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch +++ b/target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch @@ -70,7 +70,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net> } if (val & BCM2835_I2C_S_DONE) { -@@ -137,21 +141,38 @@ static irqreturn_t bcm2835_i2c_isr(int t +@@ -139,21 +143,38 @@ static irqreturn_t bcm2835_i2c_isr(int t i2c_dev->msg_err = BCM2835_I2C_S_LEN; else i2c_dev->msg_err = 0; @@ -111,7 +111,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net> } static int bcm2835_i2c_xfer_msg(struct bcm2835_i2c_dev *i2c_dev, -@@ -181,8 +202,9 @@ static int bcm2835_i2c_xfer_msg(struct b +@@ -183,8 +204,9 @@ static int bcm2835_i2c_xfer_msg(struct b time_left = wait_for_completion_timeout(&i2c_dev->completion, BCM2835_I2C_TIMEOUT); |