kernel: fix some compile warnings with kernel 3.14

[openwrt/staging/chunkeey.git] / target / linux / generic / patches-3.14 / 997-device_tree_cmdline.patch

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 8e87b1f03b429de7e470b8ea2fc52e585896f5f6..bc8e7091d5d827e307c76851b1d7a89e2e5cc3c3 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