From patchwork Wed Feb 11 22:23:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 5814721 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7E322BF440 for ; Wed, 11 Feb 2015 22:24:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF5FB20211 for ; Wed, 11 Feb 2015 22:23:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC5DE201C0 for ; Wed, 11 Feb 2015 22:23:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754265AbbBKWXp (ORCPT ); Wed, 11 Feb 2015 17:23:45 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:55603 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754044AbbBKWXo (ORCPT ); Wed, 11 Feb 2015 17:23:44 -0500 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 971F681EA6; Wed, 11 Feb 2015 23:23:42 +0100 (CET) Date: Wed, 11 Feb 2015 23:23:42 +0100 From: Pavel Machek To: pali.rohar@gmail.com, sre@debian.org, sre@ring0.de, kernel list , linux-arm-kernel , linux-omap@vger.kernel.org, tony@atomide.com, khilman@kernel.org, aaro.koskinen@iki.fi, ivo.g.dimitrov.75@gmail.com, patrikbachan@gmail.com Subject: -n900 (not mainline): fix compilation with 3.20-rc0 Message-ID: <20150211222342.GE11313@amd> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit 02aa41563bd0f14268d2142ab69694880d3425a1 Author: Pavel Date: Wed Feb 11 23:22:51 2015 +0100 Fix compilation of wl1251 specific parts with 3.20-rc0. Signed-off-by: Pavel Machek diff --git a/drivers/net/wireless/ti/wl1251/netlink.c b/drivers/net/wireless/ti/wl1251/netlink.c index e5f5a45..90a5486 100644 --- a/drivers/net/wireless/ti/wl1251/netlink.c +++ b/drivers/net/wireless/ti/wl1251/netlink.c @@ -190,11 +190,7 @@ static int wl1251_nl_test_cmd(struct sk_buff *skb, struct genl_info *info) sizeof(*cmd), cmd)) goto nla_put_failure; - ret = genlmsg_end(msg, hdr); - if (ret < 0) { - wl1251_error("%s() failed", __func__); - goto nla_put_failure; - } + genlmsg_end(msg, hdr); wl1251_debug(DEBUG_NETLINK, "TEST cmd sent, answer"); ret = genlmsg_reply(msg, info); @@ -270,11 +266,7 @@ static int wl1251_nl_interrogate(struct sk_buff *skb, struct genl_info *info) if (nla_put(msg, WL1251_NL_ATTR_CMD_IE_ANSWER, cmd_ie_len, cmd)) goto nla_put_failure; - ret = genlmsg_end(msg, hdr); - if (ret < 0) { - wl1251_error("%s() failed", __func__); - goto nla_put_failure; - } + genlmsg_end(msg, hdr); kfree(cmd); return genlmsg_reply(msg, info); @@ -406,14 +398,10 @@ static int wl1251_nl_phy_reg_read(struct sk_buff *skb, struct genl_info *info) if (nla_put_u32(msg, WL1251_NL_ATTR_REG_VAL, *reg_value)) goto nla_put_failure; - ret = genlmsg_end(msg, hdr); - if (ret < 0) { - wl1251_error("%s() failed", __func__); - goto nla_put_failure; - } + genlmsg_end(msg, hdr); kfree(reg_value); - + return genlmsg_reply(msg, info); nla_put_failure: @@ -509,11 +497,7 @@ static int wl1251_nl_reg_read(struct sk_buff *skb, struct genl_info *info) if (nla_put_u32(msg, WL1251_NL_ATTR_REG_VAL, val)) goto nla_put_failure; - ret = genlmsg_end(msg, hdr); - if (ret < 0) { - wl1251_error("%s() failed", __func__); - goto nla_put_failure; - } + genlmsg_end(msg, hdr); return genlmsg_reply(msg, info);