From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751427AbdIOHuD (ORCPT ); Fri, 15 Sep 2017 03:50:03 -0400 Received: from mout.web.de ([212.227.17.11]:52793 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750787AbdIOHt6 (ORCPT ); Fri, 15 Sep 2017 03:49:58 -0400 Subject: [PATCH 2/9] [media] tm6000: Adjust seven checks for null pointers From: SF Markus Elfring To: linux-media@vger.kernel.org, Andi Shyti , Andrew Morton , Arvind Yadav , Bhumika Goyal , Christophe Jaillet , =?UTF-8?Q?David_H=c3=a4rdeman?= , Hans Verkuil , Laurent Pinchart , Masahiro Yamada , Mauro Carvalho Chehab , Sakari Ailus , Santosh Kumar Singh , Sean Young , Wei Yongjun Cc: LKML , kernel-janitors@vger.kernel.org References: <2aade468-5dfd-76ee-f59f-c25864930f61@users.sourceforge.net> Message-ID: <145283b1-0e7c-9cde-ca0f-64f2b12ba5c7@users.sourceforge.net> Date: Fri, 15 Sep 2017 09:49:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <2aade468-5dfd-76ee-f59f-c25864930f61@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:4KgSxGbHIcgkxXEnKY03vbnZwUtJKRXTlMI/jrNTYbJvVPgvtLP 5ikJ75MS9Pmo/WqSDeOOv1KxnIUSxmNc+Yo0Snpc8CMfO4HaoDyREFeX5jKAH84ZVjAbbbE 81mZpVYICT0DNt0Mo6e4zmw5Vls6jb3pv+dYRAGZVO5SBsFypAPR7pysyTNlstX/+1LEsDe NRtt4iGmceIv+uUln21Cg== X-UI-Out-Filterresults: notjunk:1;V01:K0:7I5lUInogQo=:Z0seglWEnQpJiGri2jdE+f +TE1ZPMROv9tBWyU/U1+wPzNEBUdvuqwNhaqHzjY0Jm/EFQVpCQPzUPGK6MH/pij/R/kzpVaa U8l9Gr+1KXFZv5pA2BZ43I6rS0l2awfpdMEZQzV5JVIKKd+E4heaDVzFI63z6/yn0s6nb0dRC 6LwTQl+0Xg9/gn45T8bdL8SByRdQmRHBsO6LI+f2XuaNtXyhwGh7r+dYsNI7SbW72vZ8zQCGe 9Bf96oNOrSSY9VwUbRCTHuhfQYMlIZBPygWTNPvGuKlxQV3S6+kJy+aVWHLXayFlq1kPJOURY jhGabbmxy7ehxuqqy1bCrYM35xWxcvF1RrflKpzA6r5N7IHXmDFGCUoGi76HIvmmO/dAQ4y4S hi61FxGqsUfOmX/Jei1nXJSlbNo+AFfckG3WPEj6BMbVEGZpSdZL7HAV96kQfYJgvi7UFbX2+ osAxFPbCcRU5To/fAPo2apQGbsVnmcAramM9n/zajQV79qSKXKPdVNezUdUijyEafSf+K7FZ5 C8WWRvmbcHpx//p9WmmtUaknnPdMjS8HMu3eOq+yXrP+CTVOF8Vn01HPmzF0HkFep17j+Ubws QzQNd7xFmb0tLT5abw0JGxrQ5O2UlJrHqnu1o6ZfOINkCeWOH5aA1rO0g56RdAlIWlLObMcJC vC8DmTzgwQTrDaDxdDYPvPyDPc5p5H3lEKLhxu0sfErxbIcY5VSGywY9ngzSXEJD62/bHDRdj uewPDFGYbqLqlzncI1jU/fF74TMPbFUR+hZDfMcJifkaRkei4JcgAX2DHaBNBHtDIW3unC+Bp n7yypcUquee5N3cQHe8qJonr2rCnspUXSYsh+al8DtNzjMMunk= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 14 Sep 2017 14:51:15 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written … Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/media/usb/tm6000/tm6000-cards.c | 2 +- drivers/media/usb/tm6000/tm6000-dvb.c | 6 +++--- drivers/media/usb/tm6000/tm6000-input.c | 2 +- drivers/media/usb/tm6000/tm6000-video.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/media/usb/tm6000/tm6000-cards.c index 817bae8cb6a1..ef37fb1f05e4 100644 --- a/drivers/media/usb/tm6000/tm6000-cards.c +++ b/drivers/media/usb/tm6000/tm6000-cards.c @@ -1206,7 +1206,7 @@ static int tm6000_usb_probe(struct usb_interface *interface, /* Create and initialize dev struct */ dev = kzalloc(sizeof(*dev), GFP_KERNEL); - if (dev == NULL) { + if (!dev) { usb_put_dev(usbdev); return -ENOMEM; } diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c index 61a4e0a52716..2bc584f75f87 100644 --- a/drivers/media/usb/tm6000/tm6000-dvb.c +++ b/drivers/media/usb/tm6000/tm6000-dvb.c @@ -123,7 +123,7 @@ static int tm6000_start_stream(struct tm6000_core *dev) } dvb->bulk_urb = usb_alloc_urb(0, GFP_KERNEL); - if (dvb->bulk_urb == NULL) + if (!dvb->bulk_urb) return -ENOMEM; pipe = usb_rcvbulkpipe(dev->udev, dev->bulk_in.endp->desc.bEndpointAddress @@ -133,7 +133,7 @@ static int tm6000_start_stream(struct tm6000_core *dev) size = size * 15; /* 512 x 8 or 12 or 15 */ dvb->bulk_urb->transfer_buffer = kzalloc(size, GFP_KERNEL); - if (dvb->bulk_urb->transfer_buffer == NULL) { + if (!dvb->bulk_urb->transfer_buffer) { usb_free_urb(dvb->bulk_urb); return -ENOMEM; } @@ -360,7 +360,7 @@ static void unregister_dvb(struct tm6000_core *dev) { struct tm6000_dvb *dvb = dev->dvb; - if (dvb->bulk_urb != NULL) { + if (dvb->bulk_urb) { struct urb *bulk_urb = dvb->bulk_urb; kfree(bulk_urb->transfer_buffer); diff --git a/drivers/media/usb/tm6000/tm6000-input.c b/drivers/media/usb/tm6000/tm6000-input.c index 91889ad9cdd7..397990afe00b 100644 --- a/drivers/media/usb/tm6000/tm6000-input.c +++ b/drivers/media/usb/tm6000/tm6000-input.c @@ -352,7 +352,7 @@ static int __tm6000_ir_int_start(struct rc_dev *rc) dprintk(1, "IR max size: %d\n", size); ir->int_urb->transfer_buffer = kzalloc(size, GFP_ATOMIC); - if (ir->int_urb->transfer_buffer == NULL) { + if (!ir->int_urb->transfer_buffer) { usb_free_urb(ir->int_urb); return err; } diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c index 701494e72edc..0d45f35e1697 100644 --- a/drivers/media/usb/tm6000/tm6000-video.c +++ b/drivers/media/usb/tm6000/tm6000-video.c @@ -470,7 +470,7 @@ static int tm6000_alloc_urb_buffers(struct tm6000_core *dev) int num_bufs = TM6000_NUM_URB_BUF; int i; - if (dev->urb_buffer != NULL) + if (dev->urb_buffer) return 0; dev->urb_buffer = kmalloc(sizeof(void *)*num_bufs, GFP_KERNEL); @@ -503,7 +503,7 @@ static int tm6000_free_urb_buffers(struct tm6000_core *dev) { int i; - if (dev->urb_buffer == NULL) + if (!dev->urb_buffer) return 0; for (i = 0; i < TM6000_NUM_URB_BUF; i++) { -- 2.14.1