Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932935AbWKQQEu (ORCPT ); Fri, 17 Nov 2006 11:04:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932936AbWKQQEu (ORCPT ); Fri, 17 Nov 2006 11:04:50 -0500 Received: from caramon.arm.linux.org.uk ([217.147.92.249]:19468 "EHLO caramon.arm.linux.org.uk") by vger.kernel.org with ESMTP id S932935AbWKQQEt (ORCPT ); Fri, 17 Nov 2006 11:04:49 -0500 Date: Fri, 17 Nov 2006 16:04:39 +0000 From: Russell King To: Anderson Briglia Cc: "Linux-omap-open-source@linux.omap.com" , linux-kernel@vger.kernel.org, Pierre Ossman , ext David Brownell , Tony Lindgren , "Aguiar Carlos (EXT-INdT/Manaus)" , "Biris Ilias (EXT-INdT/Manaus)" Subject: Re: [patch 2/6] [RFC] Add MMC Password Protection (lock/unlock) support V6 Message-ID: <20061117160439.GB28514@flint.arm.linux.org.uk> Mail-Followup-To: Anderson Briglia , "Linux-omap-open-source@linux.omap.com" , linux-kernel@vger.kernel.org, Pierre Ossman , ext David Brownell , Tony Lindgren , "Aguiar Carlos (EXT-INdT/Manaus)" , "Biris Ilias (EXT-INdT/Manaus)" References: <455DB2D2.5020502@indt.org.br> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <455DB2D2.5020502@indt.org.br> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 901 Lines: 27 On Fri, Nov 17, 2006 at 09:02:10AM -0400, Anderson Briglia wrote: > @@ -366,15 +434,33 @@ static int __init mmc_init(void) > if (ret == 0) { > ret = class_register(&mmc_host_class); > if (ret) > - bus_unregister(&mmc_bus_type); > + goto error; > + } > +#ifdef CONFIG_MMC_PASSWORDS > + else { > + ret = register_key_type(&mmc_key_type); > + if (ret) > + goto error_mmc_pwd; This is obviously untested - you won't get to register the key type if bus_register() succeeds. You actually only register it if bus_register() fails. -- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/