From patchwork Wed Mar 20 15:30:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 17512 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UIKyh-0001v2-Vn; Wed, 20 Mar 2013 16:31:00 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp id 1UIKyh-0007c8-AX; Wed, 20 Mar 2013 16:30:59 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933045Ab3CTPa4 (ORCPT + 1 other); Wed, 20 Mar 2013 11:30:56 -0400 Received: from mail-bk0-f41.google.com ([209.85.214.41]:33120 "EHLO mail-bk0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932900Ab3CTPaz (ORCPT ); Wed, 20 Mar 2013 11:30:55 -0400 Received: by mail-bk0-f41.google.com with SMTP id q16so964304bkw.0 for ; Wed, 20 Mar 2013 08:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=h67Qsy1pltVZYNIN0hKMRRxwoHbO0iKnPVGYxe45gLs=; b=ThHLVg+NKJTcVtB3re42I5Hjxa8ByAvuVtXYBqGwO7czNAQ58tZqUyj74wtxodt8EU aslkLD4C6C2C7PRZQ4PMpLHkYuQpKLAiTUCXhskVdjJ8oa4E3WxeNJokZfpNJ57YOBxe GVqFCGAHS1ZyLrWJE74+BlGP8qOmDzvGxmH1+aAvGTWyqXeWuSqXKAUdJJ/JyKYNxX05 BNsEdnMN2Tlh3WMGEHYzEOejYW9SoapJX1nJnLzMXc9QGSn93k4drhSWh1MGWZx4c+vG +D3AN6PebuonHEuHLCbBFJyNEgnNwfY8a5Rp2q9hF4MOGht7sLhHi+3PhtbYtDxnioUY d6ZQ== MIME-Version: 1.0 X-Received: by 10.204.238.133 with SMTP id ks5mr11308899bkb.101.1363793446692; Wed, 20 Mar 2013 08:30:46 -0700 (PDT) Received: by 10.204.30.210 with HTTP; Wed, 20 Mar 2013 08:30:46 -0700 (PDT) Date: Wed, 20 Mar 2013 23:30:46 +0800 Message-ID: Subject: [PATCH -next] [media] gspca: remove needless check before usb_free_coherent() From: Wei Yongjun To: hdegoede@redhat.com, mchehab@redhat.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.3.20.151815 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Wei Yongjun usb_free_coherent() is safe with NULL addr and this check is not required. Signed-off-by: Wei Yongjun --- drivers/media/usb/gspca/gspca.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" 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/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c index 5800d65..924e032 100644 --- a/drivers/media/usb/gspca/gspca.c +++ b/drivers/media/usb/gspca/gspca.c @@ -567,11 +567,10 @@ static void destroy_urbs(struct gspca_dev *gspca_dev) gspca_dev->urb[i] = NULL; usb_kill_urb(urb); - if (urb->transfer_buffer != NULL) - usb_free_coherent(gspca_dev->dev, - urb->transfer_buffer_length, - urb->transfer_buffer, - urb->transfer_dma); + usb_free_coherent(gspca_dev->dev, + urb->transfer_buffer_length, + urb->transfer_buffer, + urb->transfer_dma); usb_free_urb(urb); } }