Received: by 10.192.165.148 with SMTP id m20csp776940imm; Fri, 27 Apr 2018 07:21:54 -0700 (PDT) X-Google-Smtp-Source: AB8JxZohV/izrGFB7OvXenAR9NkFtmInfIElYnSu/FYBEvE3k/7ypPhOQWwgwKpmLifwotceo5hs X-Received: by 10.98.134.5 with SMTP id x5mr2398090pfd.103.1524838913982; Fri, 27 Apr 2018 07:21:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524838913; cv=none; d=google.com; s=arc-20160816; b=HyU0JarElDQG/GLnifARjUf5WfBCfT5Odi+HAEOc6hquefrbZRZd0+OaC0NKGeWej1 C6yIS3tdxCha58utmJeuzKnJnRSoJx11HKauqWMegnWAJ/bOX0N7QZZlDUHHuxcU8h4F LckFLgvtS8u+Idu6sf3cp4YlqtIAbKMI8xEQw47Owqw0Btonx80L3BBnptHQBub07Z3z TeZXAOzS1+SunQLeluRdNZ1h9LYIWGfYDhV86MxaznYL9WfCTZSrDdmXuhaM0mkotQwO LGfSWZiWGwGgCL68YFaW0g+MnEtiQMMAd6dTHuDxu2s9fFTSQayQBwr5jHE9wV9g00Ej OiDQ== 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=IDbZ/5jgA30W4GSP2CegRveki7i+OdVLIRre1kDi87Y=; b=od+egU6+Ab7TfRBa1eYuD7AffN0FGF4vooUEcHdDSmFdApdU1+8dFGz/U89rp+oeNr qXJsW8YV5wbbTeJb3sweNOB/tdSwYwcSLFLlp0svREtAuH6p+21D1yOYz02/F9u9DS+O x0HNYEWkWHsXQjE5dlibziJOdqxpJeWhgkGXCuYE32+pcuv7yV9H1MV3mJ1M6VOUL4Jf zM8Mn1NA98LSc2OIYMIKL1qagbi4trAonCPIrQXGhYxPfjWR6ta2I52BZO2BH1bdROxy kFG9J4FTpPthPYj+exOV9y2Egy8YyfLltkSOOTF4w8uoU4umdmX2vTabbxBEb+8urIqT 1U9g== 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 j33-v6si1332393pld.395.2018.04.27.07.21.39; Fri, 27 Apr 2018 07:21:53 -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 S935273AbeD0ONC (ORCPT + 99 others); Fri, 27 Apr 2018 10:13:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:57352 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934839AbeD0OM5 (ORCPT ); Fri, 27 Apr 2018 10:12:57 -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 9A23121897; Fri, 27 Apr 2018 14:12:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A23121897 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.16 70/81] block/swim: Select appropriate drive on device open Date: Fri, 27 Apr 2018 15:59:12 +0200 Message-Id: <20180427135747.374302652@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427135743.216853156@linuxfoundation.org> References: <20180427135743.216853156@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.16-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)