diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-05-08 21:52:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-05-08 21:52:40 +0000 |
| commit | ff12bcef16abb63d66aa75235c2def3d605e24d3 (patch) | |
| tree | e801888d9acea3d791db7288762f43ef68ddaeb7 /target/linux/generic/patches-3.14 | |
| parent | 100e795bccaccd50aa9ad3835fc293b241f28b07 (diff) | |
| download | upstream-ff12bcef16abb63d66aa75235c2def3d605e24d3.tar.gz upstream-ff12bcef16abb63d66aa75235c2def3d605e24d3.tar.bz2 upstream-ff12bcef16abb63d66aa75235c2def3d605e24d3.zip | |
kernel: fix some compile warnings with kernel 3.14
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 40734
Diffstat (limited to 'target/linux/generic/patches-3.14')
| -rw-r--r-- | target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch | 8 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.14/997-device_tree_cmdline.patch | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch index 9d6da7b185..d634647ddb 100644 --- a/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch @@ -33,13 +33,17 @@ if (status < 0) --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -99,6 +99,9 @@ static int phy_config_interrupt(struct p +@@ -99,7 +99,12 @@ static int phy_config_interrupt(struct p */ static inline int phy_aneg_done(struct phy_device *phydev) { +- int retval = phy_read(phydev, MII_BMSR); ++ int retval; ++ + if (phydev->drv->aneg_done) + return phydev->drv->aneg_done(phydev); + - int retval = phy_read(phydev, MII_BMSR); ++ retval = phy_read(phydev, MII_BMSR); return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE); + } diff --git a/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch index 8e87b1f03b..bc8e7091d5 100644 --- a/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch +++ b/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch @@ -6,7 +6,7 @@ strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); + p = of_get_flat_dt_prop(node, "bootargs-append", &l); + if (p != NULL && l > 0) -+ strlcat(data, p, min(strlen(data) + (int)l, COMMAND_LINE_SIZE)); ++ strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); /* * CONFIG_CMDLINE is meant to be a default in case nothing else |