From patchwork Mon Aug 26 07:32:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2849407 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 32EBFBF546 for ; Mon, 26 Aug 2013 07:32:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CED202020F for ; Mon, 26 Aug 2013 07:32:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A843A2020E for ; Mon, 26 Aug 2013 07:32:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756008Ab3HZHcE (ORCPT ); Mon, 26 Aug 2013 03:32:04 -0400 Received: from mail-bk0-f48.google.com ([209.85.214.48]:45021 "EHLO mail-bk0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755496Ab3HZHcD (ORCPT ); Mon, 26 Aug 2013 03:32:03 -0400 Received: by mail-bk0-f48.google.com with SMTP id my13so947526bkb.21 for ; Mon, 26 Aug 2013 00:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=vTX54w524cZ2HoFHrwVQhvA+ATOt4OZwyh34HcjCAYM=; b=nXEoVwWi7dJUc1rSqtyfCvzrsjAsL/nM63xzc0NT/3OZJFafAkUwfkR/1bFN1ykier uSlPJFXu25ubT7ZwNF/bs1CvVjfZ8Yal9C10ERuD7kXDVrWHbqvWjKwAV4Oa8xxRSPiE fIyWIdKFlc3ZgUFgY09xOioBqE/fRFvjvY4gRqbCK5wt5uwhfBYMsL/mV0HrQSO2Y1+V 6myYXvfmXOyNWNhikUUr6jBlMwZGQ6ovOWJ6OyA8su7ruqD9pnSzFMm2u7SyEIS14I1r sHUwKqv+uIZS1UECARzxrscRMC7kRKYEYpW26+0wQ0ynvp+xC8VAEe3op8he1TsRQ/ri 8b0g== MIME-Version: 1.0 X-Received: by 10.204.247.71 with SMTP id mb7mr9164935bkb.7.1377502321745; Mon, 26 Aug 2013 00:32:01 -0700 (PDT) Received: by 10.205.13.74 with HTTP; Mon, 26 Aug 2013 00:32:01 -0700 (PDT) Date: Mon, 26 Aug 2013 15:32:01 +0800 Message-ID: Subject: [PATCH] zd1201: fix error return code From: Wei Yongjun To: linville@tuxdriver.com Cc: yongjun_wei@trendmicro.com.cn, linux-wireless@vger.kernel.org Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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: Wei Yongjun Fix to return -ENOMEM in the memory alloc error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun --- drivers/net/wireless/zd1201.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index 4941f20..73aa738 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c @@ -75,8 +75,10 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw) len = fw_entry->size; buf = kmalloc(1024, GFP_ATOMIC); - if (!buf) + if (!buf) { + err = -ENOMEM; goto exit; + } while (len > 0) { int translen = (len > 1024) ? 1024 : len; @@ -1762,8 +1764,10 @@ static int zd1201_probe(struct usb_interface *interface, zd->endp_out2 = 2; zd->rx_urb = usb_alloc_urb(0, GFP_KERNEL); zd->tx_urb = usb_alloc_urb(0, GFP_KERNEL); - if (!zd->rx_urb || !zd->tx_urb) + if (!zd->rx_urb || !zd->tx_urb) { + err = -ENOMEM; goto err_zd; + } mdelay(100); err = zd1201_drvr_start(zd);