Merge tag 'iwlwifi-fixes-for-kalle-2014-12-18' of git://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / drivers / w1 / w1_netlink.c

diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index dd96562372745ea11bd71d83901039423b24f403..881597a191b89c3ba4a1482f5a581efe00cdd668 100644 (file)
--- a/drivers/w1/w1_netlink.c
+++ b/drivers/w1/w1_netlink.c
@@ -598,7 +598,7 @@ static void w1_cn_callback(struct cn_msg *cn, struct netlink_skb_parms *nsp)
        msg = (struct w1_netlink_msg *)(cn + 1);
        if (node_count) {
                int size;
-               u16 reply_size = sizeof(*cn) + cn->len + slave_len;
+               int reply_size = sizeof(*cn) + cn->len + slave_len;
                if (cn->flags & W1_CN_BUNDLE) {
                        /* bundling duplicats some of the messages */
                        reply_size += 2 * cmd_count * (sizeof(struct cn_msg) +