From patchwork Tue Oct 13 10:49:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7383221 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@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 D684DBEEA4 for ; Tue, 13 Oct 2015 10:52:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0FC63207D7 for ; Tue, 13 Oct 2015 10:52:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 357AB207D0 for ; Tue, 13 Oct 2015 10:52:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932251AbbJMKwK (ORCPT ); Tue, 13 Oct 2015 06:52:10 -0400 Received: from eusmtp01.atmel.com ([212.144.249.242]:2757 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752874AbbJMKwJ (ORCPT ); Tue, 13 Oct 2015 06:52:09 -0400 Received: from tony-itx.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.30) with Microsoft SMTP Server id 14.3.235.1; Tue, 13 Oct 2015 12:52:05 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 14/54] staging: wilc1000: remove duplicate null check routine Date: Tue, 13 Oct 2015 19:49:39 +0900 Message-ID: <1444733419-17679-14-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444733419-17679-1-git-send-email-tony.cho@atmel.com> References: <1444733419-17679-1-git-send-email-tony.cho@atmel.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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 From: Leo Kim This patch removes the duplicate null check routine. The same null check routine is twice executed. Therefore the duplicated routine is not necessary. Signed-off-by: Leo Kim Signed-off-by: Tony Cho --- drivers/staging/wilc1000/host_interface.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index b7eb272..1e2a4ec 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -957,11 +957,6 @@ ERRORHANDLER: pstrHostIFscanAttr->strHiddenNetwork.pstrHiddenNetworkInfo = NULL; } - if (pstrHostIFscanAttr->pu8ChnlFreqList != NULL) { - kfree(pstrHostIFscanAttr->pu8ChnlFreqList); - pstrHostIFscanAttr->pu8ChnlFreqList = NULL; - } - if (pu8HdnNtwrksWidVal != NULL) kfree(pu8HdnNtwrksWidVal);