From patchwork Mon Aug 17 15:15:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 266224 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D0F8C433E3 for ; Mon, 17 Aug 2020 18:20:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D0AF20738 for ; Mon, 17 Aug 2020 18:20:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597688430; bh=dJ/oRwwx+jniJMh75Sm69hzzChkf4XowTV+cbAgN2Gk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Pb7HZzgyCD66lyLkoRqz2kKcC0hvJ7ERuwpXBJm1sZeL/HUEABY9kKgZPPMSKVV9N Odber3k6jQAu5wi5red4fVVd4lKRPUMNOmTXKvriHLmaaMYUwsNurt0G3VAREr6aO8 pBldDL+/Hu3eevHxf/d1bX+hzUL5xRFi4HS+VHWE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390823AbgHQSU3 (ORCPT ); Mon, 17 Aug 2020 14:20:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:52478 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388335AbgHQQEj (ORCPT ); Mon, 17 Aug 2020 12:04:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A31D20748; Mon, 17 Aug 2020 16:04:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680279; bh=dJ/oRwwx+jniJMh75Sm69hzzChkf4XowTV+cbAgN2Gk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lLPn8JiDYl4XZjjTX8IJgzc4SVQo7r9klvCUfQums7WcrIZty2wQtYVStY8pwArW0 kfTjt78NAlY+Z2j8IMd2mIny5Hpc+HbUsahxBKElLWo1tdcf9IJhfqQsamMMFUKkkQ lcJYnyFgQjgFhEwCjDXfZEKA5ULcIIY2YUVMvc7M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.4 122/270] scsi: eesox: Fix different dev_id between request_irq() and free_irq() Date: Mon, 17 Aug 2020 17:15:23 +0200 Message-Id: <20200817143801.839063942@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143755.807583758@linuxfoundation.org> References: <20200817143755.807583758@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe JAILLET [ Upstream commit 86f2da1112ccf744ad9068b1d5d9843faf8ddee6 ] The dev_id used in request_irq() and free_irq() should match. Use 'info' in both cases. Link: https://lore.kernel.org/r/20200626040553.944352-1-christophe.jaillet@wanadoo.fr Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Christophe JAILLET Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/arm/eesox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c index 134f040d58e26..f441ec8eb93df 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c @@ -571,7 +571,7 @@ static int eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id) if (info->info.scsi.dma != NO_DMA) free_dma(info->info.scsi.dma); - free_irq(ec->irq, host); + free_irq(ec->irq, info); out_remove: fas216_remove(host);