From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 44230C433E6 for ; Tue, 29 Dec 2020 21:04:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0777622209 for ; Tue, 29 Dec 2020 21:04:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726209AbgL2VEV (ORCPT ); Tue, 29 Dec 2020 16:04:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:42964 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726111AbgL2VEV (ORCPT ); Tue, 29 Dec 2020 16:04:21 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4779421D1B for ; Tue, 29 Dec 2020 21:03:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609275820; bh=yxqJytChR7v2mqhoOAWlT/51fYpRnjpXqkTlY1r8r3M=; h=From:To:Subject:Date:From; b=mVzpA9aW1f0tzYR5LF0MPDoI6eJB0uc3XG3rAqhtl15T8f0HdVMGoHzb7gWjlrJ4n wU0b1q8gXK2l4OQaMfRBasPOgeTfBsLUcsaXPee6mzBBpKUvuLzcCYIFeyk+W9I2CR JLqUxIwuCc0iL5bCI18faGsqQWxjDypQi2vunEL7HlOsqI2gf8fVtRttqPSNuIC2W5 7E6pVS4FdjU2/RDbf3VHhHFcnC34a6ggYUZwuFEpp9gxoWdoF0c9UcNXugEMrj9Ir+ HiL26rfm/PfU7NI37w6NEBg6pOybU1FZAlXoBUQhAXXdAPWBx2ySNBqUai0q6w1tPg MugoJoiwJ4BRQ== From: Oded Gabbay To: linux-kernel@vger.kernel.org Subject: [PATCH] habanalabs: fix order of status check Date: Tue, 29 Dec 2020 23:03:35 +0200 Message-Id: <20201229210337.2082-1-ogabbay@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the device is in reset or needs to be reset, the disabled property is don't-care. Signed-off-by: Oded Gabbay --- drivers/misc/habanalabs/common/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanalabs/common/device.c index 5871162a8442..0749c92cbcf6 100644 --- a/drivers/misc/habanalabs/common/device.c +++ b/drivers/misc/habanalabs/common/device.c @@ -17,12 +17,12 @@ enum hl_device_status hl_device_status(struct hl_device *hdev) { enum hl_device_status status; - if (hdev->disabled) - status = HL_DEVICE_STATUS_MALFUNCTION; - else if (atomic_read(&hdev->in_reset)) + if (atomic_read(&hdev->in_reset)) status = HL_DEVICE_STATUS_IN_RESET; else if (hdev->needs_reset) status = HL_DEVICE_STATUS_NEEDS_RESET; + else if (hdev->disabled) + status = HL_DEVICE_STATUS_MALFUNCTION; else status = HL_DEVICE_STATUS_OPERATIONAL; -- 2.25.1