lkml.org 
[lkml]   [2017]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 3/4] [media] zr364xx: Adjust ten checks for null pointers
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Mon, 28 Aug 2017 22:40:47 +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 <elfring@users.sourceforge.net>
    ---
    drivers/media/usb/zr364xx/zr364xx.c | 22 +++++++++++-----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/media/usb/zr364xx/zr364xx.c
    index 37cd6e20e68a..4cc6d2a9d91f 100644
    --- a/drivers/media/usb/zr364xx/zr364xx.c
    +++ b/drivers/media/usb/zr364xx/zr364xx.c
    @@ -385,9 +385,9 @@ static int buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
    vb);
    int rc;

    - DBG("%s, field=%d, fmt name = %s\n", __func__, field, cam->fmt != NULL ?
    - cam->fmt->name : "");
    - if (cam->fmt == NULL)
    + DBG("%s, field=%d, fmt name = %s\n", __func__, field,
    + cam->fmt ? cam->fmt->name : "");
    + if (!cam->fmt)
    return -EINVAL;

    buf->vb.size = cam->width * cam->height * (cam->fmt->depth >> 3);
    @@ -787,7 +787,7 @@ static int zr364xx_vidioc_try_fmt_vid_cap(struct file *file, void *priv,
    struct zr364xx_camera *cam = video_drvdata(file);
    char pixelformat_name[5];

    - if (cam == NULL)
    + if (!cam)
    return -ENODEV;

    if (f->fmt.pix.pixelformat != V4L2_PIX_FMT_JPEG) {
    @@ -817,7 +817,7 @@ static int zr364xx_vidioc_g_fmt_vid_cap(struct file *file, void *priv,
    {
    struct zr364xx_camera *cam;

    - if (file == NULL)
    + if (!file)
    return -ENODEV;
    cam = video_drvdata(file);

    @@ -979,13 +979,13 @@ static void read_pipe_completion(struct urb *purb)

    pipe_info = purb->context;
    _DBG("%s %p, status %d\n", __func__, purb, purb->status);
    - if (pipe_info == NULL) {
    + if (!pipe_info) {
    printk(KERN_ERR KBUILD_MODNAME ": no context!\n");
    return;
    }

    cam = pipe_info->cam;
    - if (cam == NULL) {
    + if (!cam) {
    printk(KERN_ERR KBUILD_MODNAME ": no context!\n");
    return;
    }
    @@ -1069,7 +1069,7 @@ static void zr364xx_stop_readpipe(struct zr364xx_camera *cam)
    {
    struct zr364xx_pipeinfo *pipe_info;

    - if (cam == NULL) {
    + if (!cam) {
    printk(KERN_ERR KBUILD_MODNAME ": invalid device\n");
    return;
    }
    @@ -1273,7 +1273,7 @@ static int zr364xx_mmap(struct file *file, struct vm_area_struct *vma)
    struct zr364xx_camera *cam = video_drvdata(file);
    int ret;

    - if (cam == NULL) {
    + if (!cam) {
    DBG("%s: cam == NULL\n", __func__);
    return -ENODEV;
    }
    @@ -1357,7 +1357,7 @@ static int zr364xx_board_init(struct zr364xx_camera *cam)

    pipe->transfer_buffer = kzalloc(pipe->transfer_size,
    GFP_KERNEL);
    - if (pipe->transfer_buffer == NULL) {
    + if (!pipe->transfer_buffer) {
    DBG("out of memory!\n");
    return -ENOMEM;
    }
    @@ -1373,7 +1373,7 @@ static int zr364xx_board_init(struct zr364xx_camera *cam)
    DBG("valloc %p, idx %lu, pdata %p\n",
    &cam->buffer.frame[i], i,
    cam->buffer.frame[i].lpvbits);
    - if (cam->buffer.frame[i].lpvbits == NULL) {
    + if (!cam->buffer.frame[i].lpvbits) {
    printk(KERN_INFO KBUILD_MODNAME ": out of memory. Using less frames\n");
    break;
    }
    --
    2.14.1
    \
     
     \ /
      Last update: 2017-08-29 07:34    [W:2.570 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site