From patchwork Tue Aug 3 15:27:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 60769 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A8B0AB70B8 for ; Wed, 4 Aug 2010 01:28:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756973Ab0HCP23 (ORCPT ); Tue, 3 Aug 2010 11:28:29 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:61986 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756938Ab0HCP22 (ORCPT ); Tue, 3 Aug 2010 11:28:28 -0400 Received: by wyb39 with SMTP id 39so4495994wyb.19 for ; Tue, 03 Aug 2010 08:28:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mail-followup-to:mime-version:content-type :content-disposition:user-agent; bh=RHzqdnDbM9nYuMtztZ/HeOYvvOsmfGMBXBx17lPIEu4=; b=NhX/0YCJ94/8zfrNgWwjdoyy7iuoCrcNGZUjmXrw3GOhW1o1568EtuSxx69zucHUM8 vL90mDbTPmy/ZatNiP3VHmAOZlLGHyhkMloAU1NO7COXzUIqtsVMWo3Prz34zUB3j4Fl ThkG3ybtPqX4zw6nCXKHcx1GvNollyP4G/U/Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mail-followup-to:mime-version :content-type:content-disposition:user-agent; b=VQn1cAGJxqLhcY0bo3VCvr7JPsJEFk4esyQLYgTEHwVqT9gqCgyG3gGzKXaJvL/kzp QEw541MEXrOneNBrjV2mHunYRcP6TOxjEemZ/Uv0dsGUD15dAJjSkJ8iQrV9CYtR5s+G umvWFq8vike/cl9Wp4kAfZfDWKgsV2k+n3ig4= Received: by 10.227.68.145 with SMTP id v17mr6500240wbi.159.1280849306376; Tue, 03 Aug 2010 08:28:26 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id a1sm6164698wbb.8.2010.08.03.08.28.11 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 03 Aug 2010 08:28:25 -0700 (PDT) Date: Tue, 3 Aug 2010 17:27:47 +0200 From: Dan Carpenter To: Jeff Garzik Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, alan@lxorguk.ukuu.org.uk Subject: [patch] pata_winbond: fix module init Message-ID: <20100803152549.GQ26313@bicker> Mail-Followup-To: Dan Carpenter , Jeff Garzik , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, alan@lxorguk.ukuu.org.uk MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org winbond_init_one() returns 0 on success and an error code on failure. In the original code, we always just released the regions and return -ENODEV. This was introduce in 2006 by 7e45b0e5f6f6 "[PATCH] libata: Winbond support". Signed-off-by: Dan Carpenter --- Compile tested. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c index 6d8619b..b34b594 100644 --- a/drivers/ata/pata_winbond.c +++ b/drivers/ata/pata_winbond.c @@ -248,9 +248,10 @@ static __init int winbond_init(void) if (request_region(port, 2, "pata_winbond")) { ret = winbond_init_one(port); - if (ret <= 0) + if (ret < 0) release_region(port, 2); - else ct+= ret; + else + ct++; } } }