diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2022-12-13 00:15:28 +0100 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2022-12-13 00:33:19 +0100 |
| commit | c3c9ef598cd03a05e24a85d1dcbd26db70df01d0 (patch) | |
| tree | e06f0db804b3df44ccdb09ad58c2fa2905e14c81 /target/linux/generic | |
| parent | 772434e7078e6de0cc1c7505d29ae923dc3e32bc (diff) | |
| download | upstream-c3c9ef598cd03a05e24a85d1dcbd26db70df01d0.tar.gz upstream-c3c9ef598cd03a05e24a85d1dcbd26db70df01d0.tar.bz2 upstream-c3c9ef598cd03a05e24a85d1dcbd26db70df01d0.zip | |
generic: fix wrong PTR_ERR use in of net mac address ascii patch
nvmem_cell_read return a pointer error when an error occurs. Currently
we convert the pointer error to an int while the rest of the function
return a void* and expcet an error pointer. Fix this PTR_ERR msuse
fixing compilation warning.
Fixes the following compilation warning:
net/ethernet/eth.c: In function 'nvmem_cell_get_mac_address':
net/ethernet/eth.c:547:24: warning: returning 'long int' from a function with return type 'void *' makes pointer from integer without a cast [-Wint-conversion]
547 | return PTR_ERR(mac);
| ^~~~~~~~~~~~
net/ethernet/eth.c: In function 'nvmem_cell_get_mac_address_ascii':
net/ethernet/eth.c:564:24: warning: returning 'long int' from a function with return type 'void *' makes pointer from integer without a cast [-Wint-conversion]
564 | return PTR_ERR(mac_ascii);
| ^~~~~~~~~~~~~~~~~~
Fixes: 7b863af180da ("kernel: move mac-address-ascii patches to generic")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/hack-5.10/601-of_net-add-mac-address-ascii-support.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic/hack-5.15/601-of_net-add-mac-address-ascii-support.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-5.10/601-of_net-add-mac-address-ascii-support.patch b/target/linux/generic/hack-5.10/601-of_net-add-mac-address-ascii-support.patch index f73e262bba..5dd70f5f71 100644 --- a/target/linux/generic/hack-5.10/601-of_net-add-mac-address-ascii-support.patch +++ b/target/linux/generic/hack-5.10/601-of_net-add-mac-address-ascii-support.patch @@ -22,7 +22,7 @@ Submitted-by: Yousong Zhou <yszhou4tech@gmail.com> + + mac = nvmem_cell_read(cell, &len); + if (IS_ERR(mac)) -+ return PTR_ERR(mac); ++ return mac; + if (len != ETH_ALEN) { + kfree(mac); + return ERR_PTR(-EINVAL); @@ -39,7 +39,7 @@ Submitted-by: Yousong Zhou <yszhou4tech@gmail.com> + + mac_ascii = nvmem_cell_read(cell, &len); + if (IS_ERR(mac_ascii)) -+ return PTR_ERR(mac_ascii); ++ return mac_ascii; + if (len != ETH_ALEN*2+5) { + kfree(mac_ascii); + return ERR_PTR(-EINVAL); diff --git a/target/linux/generic/hack-5.15/601-of_net-add-mac-address-ascii-support.patch b/target/linux/generic/hack-5.15/601-of_net-add-mac-address-ascii-support.patch index 83483751f8..4ab05b4ea6 100644 --- a/target/linux/generic/hack-5.15/601-of_net-add-mac-address-ascii-support.patch +++ b/target/linux/generic/hack-5.15/601-of_net-add-mac-address-ascii-support.patch @@ -22,7 +22,7 @@ Submitted-by: Yousong Zhou <yszhou4tech@gmail.com> + + mac = nvmem_cell_read(cell, &len); + if (IS_ERR(mac)) -+ return PTR_ERR(mac); ++ return mac; + if (len != ETH_ALEN) { + kfree(mac); + return ERR_PTR(-EINVAL); @@ -39,7 +39,7 @@ Submitted-by: Yousong Zhou <yszhou4tech@gmail.com> + + mac_ascii = nvmem_cell_read(cell, &len); + if (IS_ERR(mac_ascii)) -+ return PTR_ERR(mac_ascii); ++ return mac_ascii; + if (len != ETH_ALEN*2+5) { + kfree(mac_ascii); + return ERR_PTR(-EINVAL); |