kernel: fix some compile warnings with kernel 3.14

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40734 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 9d6da7b..d634647 100644 (file)
--- 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 8e87b1f..bc8e709 100644 (file)
--- 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