diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-11-02 21:05:27 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-06 14:24:07 +0100 |
| commit | 4b26ba4155db8403beb5de42bcff5bd04800a67f (patch) | |
| tree | c2b6ff9d8558964294a449d1f78bfbc5fbc07199 /target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch | |
| parent | e37dffbf3583e8f18ae197daba662ca157d99062 (diff) | |
| download | upstream-4b26ba4155db8403beb5de42bcff5bd04800a67f.tar.gz upstream-4b26ba4155db8403beb5de42bcff5bd04800a67f.tar.bz2 upstream-4b26ba4155db8403beb5de42bcff5bd04800a67f.zip | |
kernel: bump 5.10 to 5.10.77
Deleted (upstreamed):
bcm53xx/patches-5.10/081-v5.15-Revert-pinctrl-bcm-ns-support-updated-DT-binding-as-.patch [1]
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.10.y&id=01c2881bb0e0a71b87ca425e1b763ac13855aa7e
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch b/target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch index f07c160c71..cddd39ea94 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0553-r8152-adjust-rtl8152_check_firmware-function.patch @@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c -@@ -874,6 +874,14 @@ struct fw_header { +@@ -875,6 +875,14 @@ struct fw_header { struct fw_block blocks[]; } __packed; @@ -30,7 +30,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /** * struct fw_mac - a firmware block used by RTL_FW_PLA and RTL_FW_USB. * The layout of the firmware block is: -@@ -3800,10 +3808,7 @@ static long rtl8152_check_firmware(struc +@@ -3801,10 +3809,7 @@ static long rtl8152_check_firmware(struc { const struct firmware *fw = rtl_fw->fw; struct fw_header *fw_hdr = (struct fw_header *)fw->data; @@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> long ret = -EFAULT; int i; -@@ -3832,50 +3837,52 @@ static long rtl8152_check_firmware(struc +@@ -3833,50 +3838,52 @@ static long rtl8152_check_firmware(struc goto fail; goto fw_end; case RTL_FW_PLA: @@ -106,7 +106,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> dev_err(&tp->intf->dev, "Check PHY_STOP fail\n"); goto fail; -@@ -3886,28 +3893,28 @@ static long rtl8152_check_firmware(struc +@@ -3887,28 +3894,28 @@ static long rtl8152_check_firmware(struc "Invalid length for PHY_STOP\n"); goto fail; } @@ -141,7 +141,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> break; default: -@@ -3921,7 +3928,7 @@ static long rtl8152_check_firmware(struc +@@ -3922,7 +3929,7 @@ static long rtl8152_check_firmware(struc } fw_end: |