Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3608214pxb; Mon, 24 Jan 2022 13:25:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzgX0VCxsqYYConQr2jo+449zd4j3ExMDFgmtGHngiOXbHQJmqVVCWzLVrtlGrR0W/c+Cg/ X-Received: by 2002:a17:902:e88a:b0:14b:3aa4:4d17 with SMTP id w10-20020a170902e88a00b0014b3aa44d17mr9316355plg.160.1643059509932; Mon, 24 Jan 2022 13:25:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643059509; cv=none; d=google.com; s=arc-20160816; b=e2Sz5gO2zOQiIYIredBK8bqWp4NQ2AeHR6FH4lRCCxKqrg0xw3jPiAZXMZb+RLular FBVuUXF6PctMyPMPomOkwU8QrlYXDa24Mx/v8UKGwwNAmAupZ9aKmq/P6Z2RQWBaPe7X ZKjk+4IqesNK7Qe6DlLvT833dTqJsEfvTjXYo72KukqFj9zTqCQvAKvaCnU0ghMclJWP jj0dmGYAGrtX5CExxLfsekUCVO0mi5aT6LnNJFYnS0/I6nmryJxbylz5OpJ7/mckHqOM P6fJWzzfanH83NwDaR4HM3+/r42kWZzZPh6e3419m+Nb1TuK9heBs3JenH/4ZgRouyYM +EZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4pkpJehEHd6SCKit/z+plIkU1WiUkAc7YZqRzkWNHAY=; b=uP6jcxnPqztvPR1Ok904uWxeoasKCvEVh/p+RAP0ybje5Zx3xhVoWnGRVdQ4P6nnXr 3HV37GDyKhJkC/jqpwGDgm9NTMIXI1KjQJXnp12Fq/lqsSJ6q04s+dSZY9IFbb+USjPX 5iOVmxYSLunKKe7WHFtIhxuYjsQdBtp8ZB9wfK7Uo8ALq3gXs3DTNBIAbSreU84c4NkD wh3rAEqrXf9Y5ehgiXIYSm659ZdUyS00ai2K8l/1W1Mv1xRmicWtTTstiUgeOe3tcVWJ oPnUzygxWOlKVItV7spawYmFj7wizc2bFQjp6JIJYIziUUfBXuSShagnBrkfT87TtJNd n0rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="pz/sUKi7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c7si14108488pfl.364.2022.01.24.13.24.57; Mon, 24 Jan 2022 13:25:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="pz/sUKi7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352991AbiAXU6E (ORCPT + 99 others); Mon, 24 Jan 2022 15:58:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1385446AbiAXUdZ (ORCPT ); Mon, 24 Jan 2022 15:33:25 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 593A9C07E296; Mon, 24 Jan 2022 11:45:21 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 15C62B81188; Mon, 24 Jan 2022 19:45:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DE49C340E5; Mon, 24 Jan 2022 19:45:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643053518; bh=7X518gYPa/yoX6heLriG4edfkEp/un6Wnm5Rw2reZr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pz/sUKi7kgIpgWuPsYXsV8nCcCcs6CeJNBrGJo3wWn0a0alescDULptnE05ABuYZd aqfvaRl5XZ6tcxqC0cJGo3/c8v/xWzyj8XC+JcTJACPDV8IQBtHF5oaticY9uRONIE F7Y47iZKWt5Q3AxYQUpWjunFb2XKupSpdgib9xQc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Hans de Goede , Sasha Levin Subject: [PATCH 5.10 091/563] drm/vboxvideo: fix a NULL vs IS_ERR() check Date: Mon, 24 Jan 2022 19:37:36 +0100 Message-Id: <20220124184027.538833367@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit cebbb5c46d0cb0615fd0c62dea9b44273d0a9780 ] The devm_gen_pool_create() function never returns NULL, it returns error pointers. Fixes: 4cc9b565454b ("drm/vboxvideo: Use devm_gen_pool_create") Signed-off-by: Dan Carpenter Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede Link: https://patchwork.freedesktop.org/patch/msgid/20211118111233.GA1147@kili Signed-off-by: Sasha Levin --- drivers/gpu/drm/vboxvideo/vbox_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vboxvideo/vbox_main.c b/drivers/gpu/drm/vboxvideo/vbox_main.c index d68d9bad76747..c5ea880d17b29 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_main.c +++ b/drivers/gpu/drm/vboxvideo/vbox_main.c @@ -123,8 +123,8 @@ int vbox_hw_init(struct vbox_private *vbox) /* Create guest-heap mem-pool use 2^4 = 16 byte chunks */ vbox->guest_pool = devm_gen_pool_create(vbox->ddev.dev, 4, -1, "vboxvideo-accel"); - if (!vbox->guest_pool) - return -ENOMEM; + if (IS_ERR(vbox->guest_pool)) + return PTR_ERR(vbox->guest_pool); ret = gen_pool_add_virt(vbox->guest_pool, (unsigned long)vbox->guest_heap, -- 2.34.1