From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4712F2108 for ; Mon, 24 Apr 2023 13:36:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9615DC433EF; Mon, 24 Apr 2023 13:36:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1682343397; bh=Mkim9FDcw9ZkkgMeZP4bqkpWTtR0d4V/v47YXQecxEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=flYK0QVjOHIRYMST+xTTFgZ1jlJFr3lJ6rcv+Wbks3HJm8UHLitaEIlpxj3fu+m7A stAv9sfpThaCMKwyL47rYpkWy7Acma8KBuh2JdOgHJX2Z9k5IzB59DWn+BNtptpffN nmwZksTO3s9v2ktUUH9dM+61MQ73eeawSpvvCUjI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tomas Henzl , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.14 10/28] scsi: megaraid_sas: Fix fw_crash_buffer_show() Date: Mon, 24 Apr 2023 15:18:31 +0200 Message-Id: <20230424131121.665014220@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230424131121.331252806@linuxfoundation.org> References: <20230424131121.331252806@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Tomas Henzl [ Upstream commit 0808ed6ebbc292222ca069d339744870f6d801da ] If crash_dump_buf is not allocated then crash dump can't be available. Replace logical 'and' with 'or'. Signed-off-by: Tomas Henzl Link: https://lore.kernel.org/r/20230324135249.9733-1-thenzl@redhat.com Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 42d876034741c..bdd06b26e2de1 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -2983,7 +2983,7 @@ megasas_fw_crash_buffer_show(struct device *cdev, spin_lock_irqsave(&instance->crashdump_lock, flags); buff_offset = instance->fw_crash_buffer_offset; - if (!instance->crash_dump_buf && + if (!instance->crash_dump_buf || !((instance->fw_crash_state == AVAILABLE) || (instance->fw_crash_state == COPYING))) { dev_err(&instance->pdev->dev, -- 2.39.2