Merge branch 'v3.19-next/pm-samsung-2' of http://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / include / linux / genl_magic_func.h

diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
index c0894dd..667c311 100644 (file)
--- a/include/linux/genl_magic_func.h
+++ b/include/linux/genl_magic_func.h
@@ -178,12 +178,12 @@ static int s_name ## _from_attrs_for_change(struct s_name *s,             \
 #define __assign(attr_nr, attr_flag, name, nla_type, type, assignment...)      \
                nla = ntb[attr_nr];                                             \
                if (nla) {                                              \
-                       if (exclude_invariants && ((attr_flag) & DRBD_F_INVARIANT)) {           \
+                       if (exclude_invariants && !!((attr_flag) & DRBD_F_INVARIANT)) {         \
                                pr_info("<< must not change invariant attr: %s\n", #name);      \
                                return -EEXIST;                         \
                        }                                               \
                        assignment;                                     \
-               } else if (exclude_invariants && ((attr_flag) & DRBD_F_INVARIANT)) {            \
+               } else if (exclude_invariants && !!((attr_flag) & DRBD_F_INVARIANT)) {          \
                        /* attribute missing from payload, */           \
                        /* which was expected */                        \
                } else if ((attr_flag) & DRBD_F_REQUIRED) {             \