From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754883AbcBBXRm (ORCPT ); Tue, 2 Feb 2016 18:17:42 -0500 Received: from quartz.orcorp.ca ([184.70.90.242]:56746 "EHLO quartz.orcorp.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754797AbcBBXRl (ORCPT ); Tue, 2 Feb 2016 18:17:41 -0500 Date: Tue, 2 Feb 2016 16:17:35 -0700 From: Jason Gunthorpe To: Jarkko Sakkinen Cc: Peter Huewe , stable@vger.kernel.org, tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [tpmdd-devel] [PATCH] tpm: fix rollback when adding char dev fails Message-ID: <20160202231735.GB32711@obsidianresearch.com> References: <1454113694-7997-1-git-send-email-jarkko.sakkinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454113694-7997-1-git-send-email-jarkko.sakkinen@linux.intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Broken-Reverse-DNS: no host name found for IP address 10.0.0.160 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 29, 2016 at 04:28:14PM -0800, Jarkko Sakkinen wrote: > Fixed rollback and gave better names to the functions (more > self-documenting, less confusing). > > Fixes: d972b0523f ("tpm: fix call order in tpm-chip.c") > Signed-off-by: Jarkko Sakkinen > cc: stable@vger.kernel.org > drivers/char/tpm/tpm-chip.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c > index 45cc39a..1a9dcee 100644 > +++ b/drivers/char/tpm/tpm-chip.c > @@ -140,7 +140,7 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev, > } > EXPORT_SYMBOL_GPL(tpmm_chip_alloc); > > -static int tpm_dev_add_device(struct tpm_chip *chip) > +static int tpm_add_char_device(struct tpm_chip *chip) > { > int rc; > > @@ -151,7 +151,6 @@ static int tpm_dev_add_device(struct tpm_chip *chip) > chip->devname, MAJOR(chip->dev.devt), > MINOR(chip->dev.devt), rc); > > - device_unregister(&chip->dev); > return rc; > } > @@ -162,13 +161,14 @@ static int tpm_dev_add_device(struct tpm_chip *chip) > chip->devname, MAJOR(chip->dev.devt), > MINOR(chip->dev.devt), rc); > > + cdev_del(&chip->cdev); > return rc; Yep. Reviewed-By: Jason Gunthorpe Jason