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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 D7557C43381 for ; Mon, 11 Mar 2019 20:01:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EB202064A for ; Mon, 11 Mar 2019 20:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552334498; bh=gEpV6AaDsrPixLbAtnLwVFtiondkTTOyue9ndDAW9Zw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dGzkvK74/qAWbhYKeKeZIi0KRl4JzqY/JQv6jldFZ2K70O2UvB2lElbOpNLDvq/nB jGWz8Jc1S+76pzMHf00ildmw3/86aYJ/Zf2yG1p8Z8yBpROYQThqw+XNmfuO1ZB0T9 XCxOa+wGcJVcck8Jvc/D3y6FAY1H4ojzTY8cc/Rw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729561AbfCKUBh (ORCPT ); Mon, 11 Mar 2019 16:01:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:36782 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729616AbfCKT7Z (ORCPT ); Mon, 11 Mar 2019 15:59:25 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B8C3F2087C; Mon, 11 Mar 2019 19:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552334364; bh=gEpV6AaDsrPixLbAtnLwVFtiondkTTOyue9ndDAW9Zw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ucjIQFEKRd/P6ZPIDA/QA5L5eU8J6wJpmDIvoN1T1YPgtoDYAMoAR85l3GWV9qvXp UtLNHOXboCCzmN1JklZGmrbaNs9c32Ycryexchj2NI75MGD4yApUDjZ3lxhyQ37lJZ 7psBRDXr866tWAUc0+MqkjBJ5sMT5eMQofuFUbaM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yufen Yu , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 07/12] floppy: check_events callback should not return a negative number Date: Mon, 11 Mar 2019 15:59:07 -0400 Message-Id: <20190311195912.139410-7-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190311195912.139410-1-sashal@kernel.org> References: <20190311195912.139410-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yufen Yu [ Upstream commit 96d7cb932e826219ec41ac02e5af037ffae6098c ] floppy_check_events() is supposed to return bit flags to say which events occured. We should return zero to say that no event flags are set. Only BIT(0) and BIT(1) are used in the caller. And .check_events interface also expect to return an unsigned int value. However, after commit a0c80efe5956, it may return -EINTR (-4u). Here, both BIT(0) and BIT(1) are cleared. So this patch shouldn't affect runtime, but it obviously is still worth fixing. Reviewed-by: Dan Carpenter Fixes: a0c80efe5956 ("floppy: fix lock_fdc() signal handling") Signed-off-by: Yufen Yu Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/floppy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 326b9ba4518e..6914c6e1e1a8 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -3752,7 +3752,7 @@ static unsigned int floppy_check_events(struct gendisk *disk, if (time_after(jiffies, UDRS->last_checked + UDP->checkfreq)) { if (lock_fdc(drive)) - return -EINTR; + return 0; poll_drive(false, 0); process_fd_request(); } -- 2.19.1