Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp981932pxj; Thu, 27 May 2021 16:57:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgVa/K34sNXmvz4F0dOQVhro54VJ6Fm9lmql/z3OVvs9GBbVGxplnet7n3VYLmQY6KbdTh X-Received: by 2002:a50:ef15:: with SMTP id m21mr6843333eds.226.1622159845612; Thu, 27 May 2021 16:57:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622159845; cv=none; d=google.com; s=arc-20160816; b=MTCwBr+HTdnyHmhaZgYeIZv0No2iwtAIcptSdwR8EdbdZtKTUPUpwtttsZYqUJ+hAE a153uo2izHBb/bGssbeteRxZxeTtrzdNnscXzNNKJM1xNoEbb8HkaUpN7F7/siCubmAM ZXrkk09NozwRX6CV129vcZQ0dmTib9FNeB6du1lBMhQ0Hit0ZTwIVzwgwMQax2qrlLxT i2W/T0vFwEZRgTLD8xQbCeE9raf03g2D7jJ/9rzEV/RNaLRafKZyhH4MAWP55OSFuPNM Lr7ayrc1FPcYly+mLBIzImgTC0Uui+4ejDR847Z+ImyAIykJJVMczuUTkhJNwpD7yyeQ 96jg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JwB7nCaEvIIOewgKmkB3o7VgPeoqPkNeUfYkHvV4NzM=; b=AwQ0bLqKYgKhPuQj+YQnntWWG/nO/vpLy9gcCOMSmkoaCt3PGSwsWs6VWoLu5O1GmL qNEK98QUk4CIl6dexHHElN8gWYIPm9wNTCF6JcM0RQLYKnAiWGzgqGcgOY2cKSn2qxtY BD58ogdFUJ5xx6+o4NOZYAdsp6GKCzc5AWA/FG0vUHe2bHWr2m6wNVwZUbfjnElI+bvb E/xBTBLbsNNQFqd3Mwcp38lKEMtAq3NJjdJxEFJ0AYPiZvLmynIxSf+7E6MCF3WxLdnP MWaqTZyRGX3RCrRSiR+NA9u88NlVh3ZgESCTKgialpVW4pDwSi1zLTN276AZ7SLJPH0F 7VJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=PCjejpso; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m11si3402066edc.201.2021.05.27.16.57.02; Thu, 27 May 2021 16:57:25 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=PCjejpso; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235381AbhE0Tfx (ORCPT + 99 others); Thu, 27 May 2021 15:35:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235375AbhE0Tfn (ORCPT ); Thu, 27 May 2021 15:35:43 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DE55C061574 for ; Thu, 27 May 2021 12:34:10 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id pi6-20020a17090b1e46b029015cec51d7cdso1064685pjb.5 for ; Thu, 27 May 2021 12:34:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JwB7nCaEvIIOewgKmkB3o7VgPeoqPkNeUfYkHvV4NzM=; b=PCjejpsoD0Dv5/kqrNmhhTXISFG6E7MA7Aj+SezPKn47fRET4r76Fl2WMU4IDiTV+Z FHCRAd3I25oluZr2hpZJFk2GL9/lhefTM6Lmr4wbbqdp7ZOaUIQpxEbOVJEfFPUfHy4n EaHckE5PlawZXHWf6gpbwL/q9HIJrENoCpDwgmoFB/KmpsujJQvHzsfUWB/D6kZw0+Lm 6xTu6sVzclAhhbwT8vfTO99Gg9SkpNDWkCdIJ7n5RsXjJBhbAbS47XVg5SVKquE8Yl/j /lXgrsBlecadBj/KdSIHqCPAThdHAjkMF2E5ToKpGmNRLrXkuHftLDRJ4aIDRsXqSTi3 nAAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JwB7nCaEvIIOewgKmkB3o7VgPeoqPkNeUfYkHvV4NzM=; b=CYt6xGPkAMkNYn3hRdRwk3tqQ3bzBXONp+aP13xVnKytf3hCysju1MtqtW/FzfoYbB oFGzTS7pr1SWEemgcWQZYxg9McckCCqDyEu3bTS+s/sCN0wF7c1ec26s+JiPu3P1txHK I9omSXjjc5ytQo7GHan16p/IO1UozQkLtG9KiDhvebFXCljKj40AgmNQN3oJQgo1VrKH RFv0ph5VfDc4HYrsycGCedkgyVfbadY58Zuuy+oV0JWtPiXYtYzODqRZ0UnD/AAx8Ra4 ebtDmbzhcHo8z8rnUlmOlQsm/fBQGKUBVqKNq96d/JXBD4yKJWWtGe2ZqtcioTZ1TMQP BRrQ== X-Gm-Message-State: AOAM531ou1AfYFcXSAIdnDviaUx+66urOMPNVwNv6LyVrNteorIHhBjb ZeVatPQp23G04UXSHVxmLXfEF0rB61uENXOb X-Received: by 2002:a17:90a:fa91:: with SMTP id cu17mr25153pjb.178.1622144049735; Thu, 27 May 2021 12:34:09 -0700 (PDT) Received: from nhaiderx-mobl1.gar.corp.intel.com ([2409:4063:2381:b5a9:2c37:cdf5:a1b0:c566]) by smtp.gmail.com with ESMTPSA id w123sm2475357pfb.109.2021.05.27.12.34.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 12:34:09 -0700 (PDT) From: nizamhaider786@gmail.com To: laforge@gnumonks.org Cc: arnd@arndb.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Nijam Haider Subject: [PATCH V3 2/2] char: pcmcia: cm4040_cs: Fix failure handling Date: Fri, 28 May 2021 01:03:51 +0530 Message-Id: <20210527193351.638-2-nizamhaider786@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20210527193351.638-1-nizamhaider786@gmail.com> References: <20210527193351.638-1-nizamhaider786@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nijam Haider Handled failure cases of device_create() Signed-off-by: Nijam Haider --- V2 -> V3: Added label and moved the cleanup code V1 -> V2: Added description and changelog --- drivers/char/pcmcia/cm4040_cs.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c index d5e43606339c..81cc48403eb8 100644 --- a/drivers/char/pcmcia/cm4040_cs.c +++ b/drivers/char/pcmcia/cm4040_cs.c @@ -558,6 +558,7 @@ static void reader_release(struct pcmcia_device *link) static int reader_probe(struct pcmcia_device *link) { struct reader_dev *dev; + struct device *dev_ret; int i, ret; for (i = 0; i < CM_MAX_DEV; i++) { @@ -587,15 +588,22 @@ static int reader_probe(struct pcmcia_device *link) timer_setup(&dev->poll_timer, cm4040_do_poll, 0); ret = reader_config(link, i); - if (ret) { - dev_table[i] = NULL; - kfree(dev); - return ret; - } - - device_create(cmx_class, NULL, MKDEV(major, i), NULL, "cmx%d", i); + if (ret) + goto err_reader_config; + dev_ret = device_create(cmx_class, NULL, MKDEV(major, i), NULL, "cmx%d", i); + if (IS_ERR(dev_ret)) { + dev_err(&link->dev, "device_create failed for %d\n", i); + goto err_device_create; + } return 0; + +err_device_create: + reader_release(link); +err_reader_config: + dev_table[i] = NULL; + kfree(dev); + return -ENODEV; } static void reader_detach(struct pcmcia_device *link) -- 2.17.1