From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FB12C43603 for ; Mon, 16 Dec 2019 18:15:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 349F7207FF for ; Mon, 16 Dec 2019 18:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576520125; bh=vkloKGbaYFfkabExPf3X+vPpLII7Jcddq16trdxpGuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UGULjplA6s19bLJxTn+fA6CaxloBbLY6rRuJtyuEGZKk95S11spFnqrjN/5zTVZph EpA1HqEKlsCFK+kZwR1SJKEQM6d1ulEld7BDBMhwTJaDrSgEPe3EKMAyHg0basZRki 6UzMulkAC7AARHGafOa538RvgPLT5pg5EIMRL0So= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731377AbfLPSPX (ORCPT ); Mon, 16 Dec 2019 13:15:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:36084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731362AbfLPSPS (ORCPT ); Mon, 16 Dec 2019 13:15:18 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9FF42206EC; Mon, 16 Dec 2019 18:15:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576520118; bh=vkloKGbaYFfkabExPf3X+vPpLII7Jcddq16trdxpGuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uLmutP3Tsw7KDRx6ThRx2mL4AmsxzILPJNDR9CnMoqP3uB0RbC8rGOWAmsHjnHFBa OTePMFDbRkA2pgGrsKNBIWC+XIZ8FOUyq1FCijBs01Qi3XEeuXCIGfRDM4lEvNVhBG cjhtoqizVplX4Jr6iKw/qk0s46sbQtdxgy4Ta6cY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marcelo Diop-Gonzalez , Dan Carpenter , Nicolas Saenz Julienne Subject: [PATCH 5.4 023/177] staging: vchiq: call unregister_chrdev_region() when driver registration fails Date: Mon, 16 Dec 2019 18:47:59 +0100 Message-Id: <20191216174819.041877957@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174811.158424118@linuxfoundation.org> References: <20191216174811.158424118@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marcelo Diop-Gonzalez commit d2cdb20507fe2079a146459f9718b45d78cbbe61 upstream. This undoes the previous call to alloc_chrdev_region() on failure, and is probably what was meant originally given the label name. Signed-off-by: Marcelo Diop-Gonzalez Cc: stable Fixes: 187ac53e590c ("staging: vchiq_arm: rework probe and init functions") Reviewed-by: Dan Carpenter Reviewed-by: Nicolas Saenz Julienne Link: https://lore.kernel.org/r/20191203153921.70540-1-marcgonzalez@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -3299,7 +3299,7 @@ static int __init vchiq_driver_init(void return 0; region_unregister: - platform_driver_unregister(&vchiq_driver); + unregister_chrdev_region(vchiq_devid, 1); class_destroy: class_destroy(vchiq_class);