Received: by 10.192.165.148 with SMTP id m20csp796507imm; Fri, 27 Apr 2018 07:39:57 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpHAonz1/Lv65CjPJ+YPKMF/kX/JPeyB4Kpa7vdnmqByIDDh08TejHdY1v0W2F6lRqdh7Oh X-Received: by 10.98.69.137 with SMTP id n9mr1251425pfi.158.1524839997087; Fri, 27 Apr 2018 07:39:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524839997; cv=none; d=google.com; s=arc-20160816; b=e0tahPyMWZsCkqqINRig8+YJtlgFUdVDXeTLbpHh7XyHAv/ba3fwu0d4pDl2M/2iW3 DqGO1mWLYs9P5I1Im4lzBd5ykvVm++nKoO4ZQL1EC2CTeWQJ6zFvZ3vX2vL+BS5oHb3F 05OWqqSoWed2SgH1CZnEz9TuTfm0/qRTj8GvUEc2EeqCodiKbVNWEmcRmP3r+ztwzn/s VpK0Iyq+6hvogz78WuwhPfuiySdLRmUYiuprrNbOjqIsEZiUozS8NS4stjbVxc7QIs2+ 4sa/JLmS3cqB4icr9jlX4G2WS9y9dyILxX3h2zVyu88uqZ8yKwIWZT9JhZ57yktALM0j M9/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dmarc-filter :arc-authentication-results; bh=Y5hllztLpPzzYOA+6X9Q9LZFZshtXog75PN0R4guyu0=; b=043dyKSgZ2fcMRa0ixSoff4EADDZPQ3Evr3SFuST9qySKMmYoLiPcy8JCzT6vFURqh TnUS7lZ7SOGUHqqGCeiT0+klsq2TgBu/Cq0vQat2e3zhHYtH5ZfVy1L0T55Y9CrfG7vH fQVbD8PRQa3j9MyqLNCAG5+QAa13/cYGMdKW1qMELmOnQJJhNCrpGpCmAokrLbcnKYuz lv0PgEA2JlaJx6IxTpmTEV7GREpgtIqH53vNJR0onMVDXpkYNjNtsM/Zs5L1cul6oF7p HH9Z9ZeCXyUVeE3u1aE5Oj4ABWqH4oS40tRe59vuQJ9hBJ2GtQVQd1tBt6kTMGzr5DLF 7xpA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h32-v6si1370947pld.170.2018.04.27.07.39.43; Fri, 27 Apr 2018 07:39:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934783AbeD0Oil (ORCPT + 99 others); Fri, 27 Apr 2018 10:38:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:54572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934625AbeD0OJK (ORCPT ); Fri, 27 Apr 2018 10:09:10 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (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 CBA5D21892; Fri, 27 Apr 2018 14:09:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBA5D21892 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Laurent Vivier , Jens Axboe , Stan Johnson , Finn Thain Subject: [PATCH 4.14 73/80] block/swim: Select appropriate drive on device open Date: Fri, 27 Apr 2018 15:59:06 +0200 Message-Id: <20180427135736.699960388@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427135732.928644313@linuxfoundation.org> References: <20180427135732.928644313@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Finn Thain commit b3906535ccc6cd04c42f9b1c7e31d1947b3ebc74 upstream. The driver supports internal and external FDD units so the floppy_open function must not hard-code the drive location. Cc: Laurent Vivier Cc: Jens Axboe Cc: stable@vger.kernel.org # v4.14+ Tested-by: Stan Johnson Signed-off-by: Finn Thain Acked-by: Laurent Vivier Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/block/swim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -646,7 +646,7 @@ static int floppy_open(struct block_devi swim_write(base, setup, S_IBM_DRIVE | S_FCLK_DIV2); udelay(10); - swim_drive(base, INTERNAL_DRIVE); + swim_drive(base, fs->location); swim_motor(base, ON); swim_action(base, SETMFM); if (fs->ejected)