From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-298528-1524838386-2-15426202059225291180 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1524838385; b=C6vOFOc+mfyIB86ZOGfFjJdNL3r/+PlVTmHm4EdEFKyawzZdwN RV7eOAixcJnXuNk3OeiLf0jq2k//gYXYd2qoZzQkNwSu9c8cYUrZyY1U7dnWkPa0 ZUINKoMxazfGAxflxO/dMUf3NlXrBltlQas3iaEqDeiU04B60RcDsRqKe5qbs9LN +OEraBm2oHOc/AytIXRh28HC7P7+rnbEa5b2qewV5JQDUacZP9Dk91JFquRm15Tf mCRYJp3fU21Q+BgLBk5PXmb5YHqH4gkIF2N/K7v74kbBamXj+DJshC+h2K7CfI1s SibMi3cHFaGcWfGkaSSrgqqxmQfG92g7qHBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1524838385; bh=IDbZ/5jgA30W4GSP2CegRveki7i+Od VLIRre1kDi87Y=; b=fjoEZdENRdIs2kL83SuyU3A411TDVX/ikLqy8w7widtCA6 zOKafF5mTnykwGC9FqP9RUWi5HQ3U6gcDEbpMJyn0V8WgwkRjq1DlgX4OSTtodbc 4TidDXQVWQemwFcXhLAFiwSvq0gVKn3cSmE4N5D5/JY+clalhqny0hPiFiYCzIBT be4nJ4IpuSBSLHGV26wir/CTG0Z02Fua4s4p0J4nlHNV7Rg3CC7H2DLV7sYSeJ7d cwafOPnrvyA1UTclcgkIhph4M26BcfbX3hM8Ovbmn1lx1TcSX3W9h+zHGuWE3d3R FjUGWbFEOeARi4IpYEREe5ZEBdG6py0yGEOeabpg== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfDl9qgzGRmcrug4x29ofcd7A5lw7ZiJfhCU8aoDq1CI9Okgl7cBSPGV/B/Wz8xmMOa+r2GeWxaY63nafH85u0DUZuU4YPJgjQMWc9GS+NUn17s7BpHPQ Yw3s+aePRJJXc3h2bbe+Sq8ASvVWf3nVSOSRWx57VXRho/5yvawsCiVPBN7c988RRl6V5bm1rn8VwNLpYMGPd0HhpeUWI4794WIg0TOMNjrbJSu/iJ5jDZfw X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=8981fWPbAAAA:8 a=20KFwNOVAAAA:8 a=VwQbUJbxAAAA:8 a=CjxXgO3LAAAA:8 a=ag1SF4gXAAAA:8 a=UwytntJV3dstgXyDF5IA:9 a=QEXdDO2ut3YA:10 a=o72u2rHnfW5qNJ_4I8LD:22 a=AjGcO6oz07-iQ99wixmX:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935072AbeD0ONA (ORCPT ); Fri, 27 Apr 2018 10:13:00 -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 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: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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)