From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933505AbdKOW2u (ORCPT ); Wed, 15 Nov 2017 17:28:50 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:53020 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932582AbdKOW2k (ORCPT ); Wed, 15 Nov 2017 17:28:40 -0500 X-Google-Smtp-Source: AGs4zMaBf0BIRAWF2x3dzr0SSHBCY3W6WDR1aLSi2QsEte0rN3snDvWa5n9zocFN+aObyq9QTiQcMQ== Date: Wed, 15 Nov 2017 14:28:37 -0800 From: Dmitry Torokhov To: Guenter Roeck Cc: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Randy Dunlap , Wei-Ning Huang Subject: Re: [PATCH 3/3] firmware: vpd: Fix platform driver and device registration/unregistration Message-ID: <20171115222837.ani36g2zeujsia6e@dtor-ws> References: <1510779645-13052-1-git-send-email-linux@roeck-us.net> <1510779645-13052-3-git-send-email-linux@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1510779645-13052-3-git-send-email-linux@roeck-us.net> User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 15, 2017 at 01:00:45PM -0800, Guenter Roeck wrote: > The driver exit function needs to unregister both platform device and > driver. Also, during registration, register driver first and perform > error checks. > > Fixes: 049a59db34eb ("firmware: Google VPD sysfs driver") > Signed-off-by: Guenter Roeck Reviewed-by: Dmitry Torokhov > --- > drivers/firmware/google/vpd.c | 18 +++++++++++++----- > 1 file changed, 13 insertions(+), 5 deletions(-) > > diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c > index 942e358efa60..e4b40f2b4627 100644 > --- a/drivers/firmware/google/vpd.c > +++ b/drivers/firmware/google/vpd.c > @@ -326,21 +326,29 @@ static struct platform_driver vpd_driver = { > }, > }; > > +static struct platform_device *vpd_pdev; > + > static int __init vpd_platform_init(void) > { > - struct platform_device *pdev; > + int ret; > > - pdev = platform_device_register_simple("vpd", -1, NULL, 0); > - if (IS_ERR(pdev)) > - return PTR_ERR(pdev); > + ret = platform_driver_register(&vpd_driver); > + if (ret) > + return ret; > > - platform_driver_register(&vpd_driver); > + vpd_pdev = platform_device_register_simple("vpd", -1, NULL, 0); > + if (IS_ERR(vpd_pdev)) { > + platform_driver_unregister(&vpd_driver); > + return PTR_ERR(vpd_pdev); > + } > > return 0; > } > > static void __exit vpd_platform_exit(void) > { > + platform_device_unregister(vpd_pdev); > + platform_driver_unregister(&vpd_driver); > } > > module_init(vpd_platform_init); > -- > 2.7.4 > -- Dmitry