Changeset 40734


Ignore:
Timestamp:
2014-05-08T23:52:40+02:00 (4 years ago)
Author:
hauke
Message:

kernel: fix some compile warnings with kernel 3.14

Signed-off-by: Hauke Mehrtens <hauke@…>

Location:
trunk/target/linux/generic/patches-3.14
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch

    r40023 r40734  
    3434--- a/drivers/net/phy/phy.c 
    3535+++ b/drivers/net/phy/phy.c 
    36 @@ -99,6 +99,9 @@ static int phy_config_interrupt(struct p 
     36@@ -99,7 +99,12 @@ static int phy_config_interrupt(struct p 
    3737  */ 
    3838 static inline int phy_aneg_done(struct phy_device *phydev) 
    3939 { 
     40-       int retval = phy_read(phydev, MII_BMSR); 
     41+       int retval; 
     42+ 
    4043+       if (phydev->drv->aneg_done) 
    4144+               return phydev->drv->aneg_done(phydev); 
    4245+ 
    43         int retval = phy_read(phydev, MII_BMSR); 
     46+       retval = phy_read(phydev, MII_BMSR); 
    4447  
    4548        return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE); 
     49 } 
  • trunk/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch

    r39348 r40734  
    77+       p = of_get_flat_dt_prop(node, "bootargs-append", &l); 
    88+       if (p != NULL && l > 0) 
    9 +               strlcat(data, p, min(strlen(data) + (int)l, COMMAND_LINE_SIZE)); 
     9+               strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); 
    1010  
    1111        /* 
Note: See TracChangeset for help on using the changeset viewer.