From patchwork Fri Oct 20 21:51:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 10021029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 03B5660234 for ; Fri, 20 Oct 2017 21:52:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E83F928F67 for ; Fri, 20 Oct 2017 21:52:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA6A928F70; Fri, 20 Oct 2017 21:52:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 224EA28F67 for ; Fri, 20 Oct 2017 21:52:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753508AbdJTVwa (ORCPT ); Fri, 20 Oct 2017 17:52:30 -0400 Received: from mail-bl2nam02on0073.outbound.protection.outlook.com ([104.47.38.73]:28183 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753147AbdJTVw0 (ORCPT ); Fri, 20 Oct 2017 17:52:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mscc365.onmicrosoft.com; s=selector1-microsemi-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ZTXK8/zXOT5SRz++X63rBX9mYLWmOoLc0jojt6z2lIE=; b=kV/IgC9txn5Sg9ibawBCSulLdqo2BGtwBz2/qca/JjthVifeV//O8n5FRa10JoTBVYdPzkJvG/XUGMDvFYo4hH193JRM7pabHkk3XQLMI9n74XF8kkoIaeviibi0z5Xda782AR3o9STPlYkAw7EnrJu3sObXDSNKL20E3I8CGmY= Received: from MWHPR02CA0022.namprd02.prod.outlook.com (10.168.209.160) by BLUPR0201MB1828.namprd02.prod.outlook.com (10.162.239.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 20 Oct 2017 21:52:20 +0000 Received: from BY2FFO11FD048.protection.gbl (2a01:111:f400:7c0c::190) by MWHPR02CA0022.outlook.office365.com (2603:10b6:300:4b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Fri, 20 Oct 2017 21:52:20 +0000 Authentication-Results: spf=pass (sender IP is 208.19.100.21) smtp.mailfrom=microsemi.com; suse.com; dkim=none (message not signed) header.d=none;suse.com; dmarc=bestguesspass action=none header.from=microsemi.com; Received-SPF: Pass (protection.outlook.com: domain of microsemi.com designates 208.19.100.21 as permitted sender) receiver=protection.outlook.com; client-ip=208.19.100.21; helo=avsrvexchhts1.microsemi.net; Received: from avsrvexchhts1.microsemi.net (208.19.100.21) by BY2FFO11FD048.mail.protection.outlook.com (10.1.15.176) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.77.10 via Frontend Transport; Fri, 20 Oct 2017 21:52:20 +0000 Received: from [127.0.1.1] (10.238.32.34) by avsrvexchhts1.microsemi.net (10.100.34.105) with Microsoft SMTP Server id 14.3.361.1; Fri, 20 Oct 2017 14:51:40 -0700 Subject: [PATCH 06/12] hpsa: change timeout for internal cmds From: Don Brace To: , , , , , , , , , , CC: Date: Fri, 20 Oct 2017 16:51:38 -0500 Message-ID: <150853629874.28275.9150965234203060853.stgit@brunhilda> In-Reply-To: <150853443786.28275.17878578984391668998.stgit@brunhilda> References: <150853443786.28275.17878578984391668998.stgit@brunhilda> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:208.19.100.21; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916004)(39860400002)(376002)(346002)(2980300002)(438002)(189002)(199003)(50986999)(5660300001)(2950100002)(97736004)(356003)(54356999)(58126008)(53936002)(50466002)(106002)(69596002)(2906002)(478600001)(305945005)(33716001)(106466001)(76176999)(189998001)(33646002)(103116003)(81156014)(4326008)(104016004)(8676002)(8936002)(2201001)(68736007)(9686003)(86362001)(81166006)(23676002)(16576012)(110136005)(230700001)(316002)(47776003)(83506002)(77096006)(921003)(1121003)(83996005)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0201MB1828; H:avsrvexchhts1.microsemi.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD048; 1:zK0e3HQGej92UbIhJh+b48/z/Vqvy9Qoh9XCHxNFU2wbtCglUfTkG7wow7AOI+9XizQAMR0P/Jtu18ioOI+kFpedoJ3c4BGe3nvC6Bvq6fQ2XJ/h+mXseozgrEozDDFA X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f500ceff-833a-4ed6-65b9-08d51804d6b7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199); SRVR:BLUPR0201MB1828; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1828; 3:p48x7Xm2LXG215etGpzFeCQos/g8WbmmokInV409zhRPVbTIbhmumP8cGGqmLL7Ai4xqpkttPkKzDXk/NWx/blrJRlCdXNKdKMjf5GVvw6FyL4FfHKeeZsTqtUE/XIxTsS6rT9oU0g7cum5zXz6h7najCfRbPYKdpXJHyQ1Yg+Du6ck4HFr2QK0NFe9TOl/DPQSmEcQSopnpiRjfuUqBZb+ByvVEYBRP+u0C6b9rZKkkeyAgJFFheB6ADYsax2K+Bq7jkV66ypmjYkWcGBIxMMnLBSAGRSHmprBd2bhXhbWKwOyzt43Rj3Am8ka087wsjZ7sBwZMF4VD7ygOYXGlxkxc3JBz4SwFS8XlPQ4X00Y=; 25:FAdU3FqHE0FI3IuMqcACAkYOFT95YCwn+rj9rO8m5eHpcAX2m5HAx6cceO2A3xShO7Yb9tCco2HmXTyIj4/3dtXw+Whmn1EKkPLTs6IB7O2W/kuQ1P7M/yS/QXudf1ySK3AbHgK5JKOr1/WOuovCdmzHKj8UW0YN7NTfwUnrdsiEeYoO2D6ueye9Fxx0Hmj2ByTaa9wKz3xQKv1qh+Y1T8flggriYjYGutxRproUaTlwzvGsOUEY9loXZNuQF3USCKwTh9M81I1zVv1VrWXcbeHXjC8VeG4WR2Lv5IDRbJGMxO6duF3gFy/3cFfGvfZB4+qlz0HZsn+mQjwd2FFQ7Q== X-MS-TrafficTypeDiagnostic: BLUPR0201MB1828: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1828; 31:3bCXjUCOQhzTj759K2AVLCMpY+hGapQmZOEpC4BId03AwbfmpLeC+CyiYGZW8EUvWofUwCWieLj2yeSv4tlGGcxPXJhupOyVjtRAUMGs3bbDgXqvZIgCe+9To2CQQAZ7NeBzMFY2D8fufet6QDQe5k/YnjXxhvonFgn448LBu4cYXETk9eatjfW8dxDowDHGXgzQ6kfAsp3Ngn/Z7RLIPAm1FFDeGx97Thq5DUEFvAI=; 20:kVxQWFiSIWi4zkuQR3zYRBfLEmRRMVUahsWdPlg3Yqwa2wWENHQsxOIotTCTaL3OWl+le3GlTkCqGo1rF00oDOMZ12ANvtmbqIHpc1E6dfrcSD+MShZH6+vYtKE6ToEfHBQ256mqGKpcNknsINKTlO5PZH15PiJE9zzxcYvZAJGCuFrqdMmEXbdYKrkhj2B/RCXYdnDWwZtb9RpNPaSfFDSodZgUiB0/cylDZY7LlfGOSRFTE+VIiyjTDXqhvDzkW33MyF42dnXLUEQAuf/2sNtkIMWT9BEArIkqKltEQbPoTBCoqbX0n49l8rAG9yHRNhZtnrS8XYqYWN5BrXvdaeBhvnxhF02s1r6Zy9TiMO8pdZmkNI8cxo4MyOKco1kmqGiANiUbD9Nk7FkE/zNpt7EpHXge1H2IXA+UvfLGIkxln9vbm1uRAkpeq20oE+gAPWZ1mhNi1Q2wKtBIwZs9AeOalyJvbsIU99A+TVv0594cuMvP6bn+0C2riVj5ktzA X-Exchange-Antispam-Report-Test: UriScan:(72170198267865); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(10201501046)(3231020)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123562025)(20161123564025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0201MB1828; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0201MB1828; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1828; 4:TqXY8X3CoBzRVA22CKrkHKZtBhgMsnT7gPWYR5rq4o0u0oLMMhm3RY5HnLm2gt3RvWDs6zPC3V0E+NKOiZdWht4sgTFztjEEFLKTqDxYMrVZyhmBsOvqAXu+qXUvRdpkBuFf1ZWXx9GEoIG9PjZfkOMWWcTZeEfv56LALIHRYGGelWh6Dv0utFJBwfV2Aj43WLXU6dNk0XB+kfxBl+3c3FQJ0xJwMJcOO3AB5NPQzdvKEp2v5Oa+oE3muwztVXNEG8EM/fVk5tzuCDeDpUmTOECRwvZGTosC9lKrmT1nl7k= X-Forefront-PRVS: 0466CA5A45 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTFVQUjAyMDFNQjE4Mjg7MjM6RmhBdnplalpTbTNjN20xai9HclBOOEhz?= =?utf-8?B?N2dCRG5Yb0pLdzJ4aklvZU1MYzI2YUUyalRDQlQxK2ZqMDFUSzdnY01wdXVz?= =?utf-8?B?Q2g0dU1ncEZqNlBMbDczMTJNTW51MlBaalcySGo2WHpHcGw2eUt0WW5PbVBt?= =?utf-8?B?R3hUNG5abmhDTm1sbzhhdmNaTHNjdFhJd0NDcHN4VzNXbkZReEROSlJOQ25D?= =?utf-8?B?djFjSnBycVlZb1Q1VGJ2WEVmTlBjUnVYZW8wTnB1TzFsV0R5bjR5NEdhOGk4?= =?utf-8?B?S0ZMUjZ4eDZCVlFuTXlCUkF0ckt6aUZFNU1JcUNPUTF3ZlFBa3NNWWV1Mk1r?= =?utf-8?B?MEJzVHM4RUJVNjJEWktMb3ZBcGFtTjE1MzRFbjB4KzlKZzZNdXdubUx0YTBl?= =?utf-8?B?cTJTdGJlRXc0bzYwQW5vb2twRHdBWVhhTW9PQWRvTTQvT0pYMVAwRnNXQ3VF?= =?utf-8?B?cHMyRXlqTVJCYlJmc2xwY1FUSVZ0YjcxVit1YU9jMTk1KzBESHU4TlFPc0pt?= =?utf-8?B?V3NWdVdKaXFuUFpTS0tiOUcxVDZBVCtMTG5QWEFvbmYzSE5QTmNDWmVyUDBQ?= =?utf-8?B?azBvbkdMWUVOTW45UEhHUE9yWVpXYXJManE0NWJzWkw3cDA4MlRZOXFvTnJw?= =?utf-8?B?QzRuSDZTTVRCd2V0Z3JMRFphSjd2SFNmUEVFNFlyZVdrdVBOWTBUdDZ6VUtZ?= =?utf-8?B?bk43VlBKUDNEOTB5OEFDL01CN3daVW5SM1dodW8xQmdSNmNHWHgwcG9MdTdp?= =?utf-8?B?bEhFNnJWcUxodkVJdXZpWkJNQmZha2xxa0ZvdUt5anVBU1BXTmREcTkvUFN0?= =?utf-8?B?bGNQbFAxRTdQckNMVm1SbWkzRkNYaFNocWVSODUxZGFnWWdYQ1hGVTVMSmx1?= =?utf-8?B?YWw3aExNYlFmWjJrUVZQMkNMcWpkU203VUxvbnMzVVBEa0c5cVRxMmE3bnlO?= =?utf-8?B?cWxLRHRoQ04zTkRpQ0ZDOHdrYmNUd2JzcVEvU2lRK0FEMExjeExYNUtMS1FN?= =?utf-8?B?c3JMaWFHRC9MM3hLTU94RFlJYmlyVkxPcnNteEg5TUJHM1A5SStwR1FMWGhm?= =?utf-8?B?cVYxOU1rVndJeW1nU2VMSFQxUkhsNWRRSko4UjdzKzEyTk1BQ1J1ODZTRG5N?= =?utf-8?B?YTVtQ1BlVzl6YVpYTzlnemRDa015WXVuSmlXODBXQWZuN21XNzVlY2NtM2Jq?= =?utf-8?B?SG1jVUxleGJFSUsxZEQ4MmI4MWpPbnUvV3MxcGRtOE1hM3NkQ0VVWjVXSlRj?= =?utf-8?B?RWZoRzlaakxvRmwrckk2YTF6YTlaa28xd1RDZ0Vta1VnK21FMk9YYWRQUW9B?= =?utf-8?B?RlVFdUl6Y0l3NEU3cVZubjV5bnd3aWF4RDNld1FPVlNsWTVNTmVSTHRRdGRV?= =?utf-8?B?TFI1dkg5UzNBYjJzVmM2V1BQZDliNlJlNHdXUy8wb2thQmwyT2dTUnF6UjNo?= =?utf-8?B?QkpncTFhb2ladU1jZStCOEorUThScmVMQlZvVER4YWxIMm1uVFVmRlFicjJh?= =?utf-8?B?Z1dKdFRXNjUwYXV2QWpQci9RTC9FT1FEVER3c3JCZzlsTGhXMUtSQ0dxOVNk?= =?utf-8?B?Q3pES2NtZVpYdHBhcUVSdHU4MSs4N081enRoaUZCeWl4b0diclhYK010MURO?= =?utf-8?Q?I=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1828; 6:qqT5MRGnqPuTAYJMpmt86AzRjUjj08mq5DaLV7M8AobqduDbRlxGeYMMA66mph0QMcn8I4ACm+PGVpdkQLA3Xcj5gR4gefQT8QbA3R8k1c9rZXSG7/y7aiAjQKuIsSw6PjLyRcqx+9GeehO5yc37sR2CT84K7KAT0YsD3cUzruRcCupWRfq9uq0EsB7N06/3QYe9MGqI8aEh4U5ftdi22jp+tP8zBkpEupQWU78JMkaxaIxwq7X+ElEwXpNkVd1wUQrcfXyL6Ctr+u5/lhCB1T3R/1gUIvGP0d+BwKPaaKabaA4rc58qjD/b8nYrWgHLodIZwp/bBEnfjT+c8xcQ9A==; 5:sQiPCVZU0haKhrUARHt8oGz/zadlNxk1kpHalj6iDCcDcNwzD3j+gfOBtOVPB6baaNVBYeWhcXOR2xMSV25mihchxX3xJfCo/WPujuWZnisXQkI90OHmkB/eZpKIMtHCRFTqZwSYVyokdQKMW+C7Vg==; 24:F6ew/Nfl4r+TVOCui4thG3z20WFNfHAkQQjxY9Esk3QqBWV1sDG8rzN+43s4sXm3lq895FVBN9mUH4BGwFKGQBZV71aIrF9OpXkt4+a+J2c=; 7:cH4g7XxXIGJzuaS9ogcV2vJMHf4i6nc6QfALXrA64YlhnvxfeTmkjRrSsTHCZ6i+OmTbgi8TsYyIUrXpmYqFGZZ9XrzQlXc75vQRneo1GDZ3vW5sXeJo5HwHGW4v2biYSzPr/k9b1WvCNCxmR0iQ+F2eh/dvucomA999fB1ZHsbSLY7Cxpk4YXGZuPIFYVHtW0YDoBhrEDdbVnh7p3V9+gkLV+JSZJQ09vYbcZYC+Rw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: microsemi.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2017 21:52:20.1576 (UTC) X-MS-Exchange-CrossTenant-Id: f267a5c8-86d8-4cc9-af71-1fd2c67c8fad X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f267a5c8-86d8-4cc9-af71-1fd2c67c8fad; Ip=[208.19.100.21]; Helo=[avsrvexchhts1.microsemi.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0201MB1828 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There are times when the DEFAULT_TIMEOUT (30 seconds) is not enough. Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Reviewed-by: Kevin Barnett Signed-off-by: Don Brace --- drivers/scsi/hpsa.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 6056bbd..4ab53df 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -2929,7 +2929,7 @@ static int hpsa_scsi_do_inquiry(struct ctlr_info *h, unsigned char *scsi3addr, goto out; } rc = hpsa_scsi_do_simple_cmd_with_retry(h, c, - PCI_DMA_FROMDEVICE, DEFAULT_TIMEOUT); + PCI_DMA_FROMDEVICE, NO_TIMEOUT); if (rc) goto out; ei = c->err_info; @@ -3213,7 +3213,7 @@ static int hpsa_get_raid_map(struct ctlr_info *h, return -1; } rc = hpsa_scsi_do_simple_cmd_with_retry(h, c, - PCI_DMA_FROMDEVICE, DEFAULT_TIMEOUT); + PCI_DMA_FROMDEVICE, NO_TIMEOUT); if (rc) goto out; ei = c->err_info; @@ -3256,7 +3256,7 @@ static int hpsa_bmic_sense_subsystem_information(struct ctlr_info *h, c->Request.CDB[9] = (bmic_device_index >> 8) & 0xff; rc = hpsa_scsi_do_simple_cmd_with_retry(h, c, - PCI_DMA_FROMDEVICE, DEFAULT_TIMEOUT); + PCI_DMA_FROMDEVICE, NO_TIMEOUT); if (rc) goto out; ei = c->err_info; @@ -3284,7 +3284,7 @@ static int hpsa_bmic_id_controller(struct ctlr_info *h, goto out; rc = hpsa_scsi_do_simple_cmd_with_retry(h, c, - PCI_DMA_FROMDEVICE, DEFAULT_TIMEOUT); + PCI_DMA_FROMDEVICE, NO_TIMEOUT); if (rc) goto out; ei = c->err_info; @@ -3315,7 +3315,7 @@ static int hpsa_bmic_id_physical_device(struct ctlr_info *h, c->Request.CDB[9] = (bmic_device_index >> 8) & 0xff; hpsa_scsi_do_simple_cmd_with_retry(h, c, PCI_DMA_FROMDEVICE, - DEFAULT_TIMEOUT); + NO_TIMEOUT); ei = c->err_info; if (ei->CommandStatus != 0 && ei->CommandStatus != CMD_DATA_UNDERRUN) { hpsa_scsi_interpret_error(h, c); @@ -3388,7 +3388,7 @@ static void hpsa_get_enclosure_info(struct ctlr_info *h, c->Request.CDB[5] = 0; rc = hpsa_scsi_do_simple_cmd_with_retry(h, c, PCI_DMA_FROMDEVICE, - DEFAULT_TIMEOUT); + NO_TIMEOUT); if (rc) goto out; @@ -3628,7 +3628,7 @@ static int hpsa_scsi_do_report_luns(struct ctlr_info *h, int logical, if (extended_response) c->Request.CDB[1] = extended_response; rc = hpsa_scsi_do_simple_cmd_with_retry(h, c, - PCI_DMA_FROMDEVICE, DEFAULT_TIMEOUT); + PCI_DMA_FROMDEVICE, NO_TIMEOUT); if (rc) goto out; ei = c->err_info; @@ -3763,7 +3763,7 @@ static unsigned char hpsa_volume_offline(struct ctlr_info *h, (void) fill_cmd(c, TEST_UNIT_READY, h, NULL, 0, 0, scsi3addr, TYPE_CMD); rc = hpsa_scsi_do_simple_cmd(h, c, DEFAULT_REPLY_QUEUE, - DEFAULT_TIMEOUT); + NO_TIMEOUT); if (rc) { cmd_free(h, c); return HPSA_VPD_LV_STATUS_UNSUPPORTED; @@ -8620,7 +8620,7 @@ static void hpsa_disable_rld_caching(struct ctlr_info *h) goto errout; rc = hpsa_scsi_do_simple_cmd_with_retry(h, c, - PCI_DMA_FROMDEVICE, DEFAULT_TIMEOUT); + PCI_DMA_FROMDEVICE, NO_TIMEOUT); if ((rc != 0) || (c->err_info->CommandStatus != 0)) goto errout; @@ -8632,7 +8632,7 @@ static void hpsa_disable_rld_caching(struct ctlr_info *h) goto errout; rc = hpsa_scsi_do_simple_cmd_with_retry(h, c, - PCI_DMA_TODEVICE, DEFAULT_TIMEOUT); + PCI_DMA_TODEVICE, NO_TIMEOUT); if ((rc != 0) || (c->err_info->CommandStatus != 0)) goto errout; @@ -8642,7 +8642,7 @@ static void hpsa_disable_rld_caching(struct ctlr_info *h) goto errout; rc = hpsa_scsi_do_simple_cmd_with_retry(h, c, - PCI_DMA_FROMDEVICE, DEFAULT_TIMEOUT); + PCI_DMA_FROMDEVICE, NO_TIMEOUT); if ((rc != 0) || (c->err_info->CommandStatus != 0)) goto errout;