Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S946386AbcJaUSv (ORCPT ); Mon, 31 Oct 2016 16:18:51 -0400 Received: from ns.gsystem.sk ([62.176.172.50]:36103 "EHLO gsystem.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S946216AbcJaUSt (ORCPT ); Mon, 31 Oct 2016 16:18:49 -0400 From: Ondrej Zary To: Christoph Hellwig Cc: Finn Thain , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] g_NCR5380: Fix release region in error handling Date: Mon, 31 Oct 2016 21:18:32 +0100 Message-Id: <1477945112-25659-7-git-send-email-linux@rainbow-software.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1477945112-25659-1-git-send-email-linux@rainbow-software.org> References: <1477945112-25659-1-git-send-email-linux@rainbow-software.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1044 Lines: 33 When a SW-configurable card is specified but not found, the driver releases wrong region, causing the following message in kernel log: Trying to free nonexistent resource <0000000000000000-000000000000000f> Fix it by assigning base earlier. Signed-off-by: Ondrej Zary --- drivers/scsi/g_NCR5380.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c index 6a08d3e..d33e71f 100644 --- a/drivers/scsi/g_NCR5380.c +++ b/drivers/scsi/g_NCR5380.c @@ -258,12 +258,12 @@ static int generic_NCR5380_init_one(struct scsi_host_template *tpnt, if (ports[i]) { /* At this point we have our region reserved */ magic_configure(i, 0, magic); /* no IRQ yet */ - outb(0xc0, ports[i] + 9); - if (inb(ports[i] + 9) != 0x80) { + base = ports[i]; + outb(0xc0, base + 9); + if (inb(base + 9) != 0x80) { ret = -ENODEV; goto out_release; } - base = ports[i]; port_idx = i; } else return -EINVAL; -- Ondrej Zary