diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-12-16 21:23:55 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-12-16 22:23:52 +0100 |
| commit | cb58c7fe733ee168c9909b208af4c676ce3e0499 (patch) | |
| tree | c8f7f914805860b05e2402c70abf61b05319677c /target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch | |
| parent | fb52c40531915df942758aae8c2774154bdc9f44 (diff) | |
| download | upstream-cb58c7fe733ee168c9909b208af4c676ce3e0499.tar.gz upstream-cb58c7fe733ee168c9909b208af4c676ce3e0499.tar.bz2 upstream-cb58c7fe733ee168c9909b208af4c676ce3e0499.zip | |
kernel: bump 4.14 to 4.14.212
Refreshed all patches.
Removed patches because included in upstream:
- 315-v5.10-usbnet-ipeth-fix-connectivity-with-ios-14.patch
Compile-tested on: ipq40xx, ath79, x86/64
Runtime-tested on: ipq40xx, ath79
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch')
| -rw-r--r-- | target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch b/target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch index e5d1edfb72..39d8de8bd1 100644 --- a/target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch +++ b/target/linux/ipq40xx/patches-4.14/088-0010-i2c-qup-fix-buffer-overflow-for-multiple-msg-of-maxi.patch @@ -233,7 +233,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de> /* schedule the EOT and FLUSH I2C tags */ len = 1; if (rx_cnt) { -@@ -886,11 +878,19 @@ desc_err: +@@ -887,11 +879,19 @@ desc_err: return ret; } @@ -253,7 +253,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de> enable_irq(qup->irq); ret = qup_i2c_req_dma(qup); -@@ -913,9 +913,34 @@ static int qup_i2c_bam_xfer(struct i2c_a +@@ -914,9 +914,34 @@ static int qup_i2c_bam_xfer(struct i2c_a goto out; writel(qup->clk_ctl, qup->base + QUP_I2C_CLK_CTL); @@ -290,7 +290,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de> out: disable_irq(qup->irq); -@@ -1468,7 +1493,8 @@ static int qup_i2c_probe(struct platform +@@ -1469,7 +1494,8 @@ static int qup_i2c_probe(struct platform else if (ret != 0) goto nodma; @@ -300,7 +300,7 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de> qup->btx.sg = devm_kzalloc(&pdev->dev, sizeof(*qup->btx.sg) * blocks, GFP_KERNEL); -@@ -1611,7 +1637,7 @@ nodma: +@@ -1612,7 +1638,7 @@ nodma: one_bit_t = (USEC_PER_SEC / clk_freq) + 1; qup->one_byte_t = one_bit_t * 9; qup->xfer_timeout = TOUT_MIN * HZ + |