From patchwork Fri Mar 29 17:09:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 232464 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 184E62C00C4 for ; Sat, 30 Mar 2013 04:10:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754102Ab3C2RKE (ORCPT ); Fri, 29 Mar 2013 13:10:04 -0400 Received: from mail-ea0-f202.google.com ([209.85.215.202]:34582 "EHLO mail-ea0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754679Ab3C2RKD (ORCPT ); Fri, 29 Mar 2013 13:10:03 -0400 X-Greylist: delayed 6197 seconds by postgrey-1.27 at vger.kernel.org; Fri, 29 Mar 2013 13:10:03 EDT Received: by mail-ea0-f202.google.com with SMTP id a15so48126eae.1 for ; Fri, 29 Mar 2013 10:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=bXvarQq2gwYDOjSytiB7mxQ81D3keUtaDtcL6im/oTU=; b=cCa34pBVvjIggFpVcIVfWnGnrOcdOMxV7vS/IWI099UUvf06vyRX035RWuWBbuFv7c +pWHPu6ssC/UwGvhovpFW3Ja2Va/Fy/yzM2q0XuCKOFF9f3Brp5a/39on/0GR/Ey2+9h tFAd1GUFWDzk07NENNzNQ/JaDAjBQaanxwO4E+YNC40pBJ8M/WCrggC2biacGGQ9TwMi vVYTbXIPYFLpBOmDLnOJzgGedszHQr/QHOUg7fgmWn8Ba76ucSe8XiQQIM47QbUJioij PFI7HNp223+PDJIukF43hghjmbNv4L4/KnGkOR5pjvIu8VY08hF4uGx0M8zyN9mcnJz4 DdLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=bXvarQq2gwYDOjSytiB7mxQ81D3keUtaDtcL6im/oTU=; b=WmTYQ6lnA3sxkTcxwk+3g7j3G2k43TvlN2MDFxaDh0z8gfCCa6C8KjCCmxoEeTe2zj KBbtao2hqqoCO+GQbWYnJjmKfPQxYR+QZBHfmOQp1IbKnCdcSJNwGTxfcKI1nE6i9aTd T6LS5GI8JmX8TjxDOR9z6/9rjkskSp0COcaaz9zfgSjPJ18gT8rSEBSbJPqVA6qhwpzJ +vXl/dKAXD7w9zxO12fMAZJzbiq9YTpb5ozAphv9DVP2ON890mqsDxXW7y4v3hyl9Grn GY9QwFhSrDpD1johjbTpxREIOh1Ml2/jTmofx8xeemVl9qGTzhhdpN/G6gzz1mTIe+4O oiJA== X-Received: by 10.15.33.2 with SMTP id b2mr4752151eev.7.1364577001816; Fri, 29 Mar 2013 10:10:01 -0700 (PDT) Received: from corp2gmr1-1.eem.corp.google.com (corp2gmr1-1.eem.corp.google.com [172.25.138.99]) by gmr-mx.google.com with ESMTPS id 6si860034eej.0.2013.03.29.10.10.01 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Fri, 29 Mar 2013 10:10:01 -0700 (PDT) Received: from hippo3.mtv.corp.google.com (hippo3.mtv.corp.google.com [172.18.124.97]) by corp2gmr1-1.eem.corp.google.com (Postfix) with ESMTP id 8FAFA1CA2F6; Fri, 29 Mar 2013 10:10:01 -0700 (PDT) Received: by hippo3.mtv.corp.google.com (Postfix, from userid 60833) id CB8A3204E4; Fri, 29 Mar 2013 10:10:00 -0700 (PDT) From: Gwendal Grignou To: ronald645@gmail.com Cc: krzysiek@podlesie.net, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Gwendal Grignou Subject: [PATCH v2] [libata] Fix HDIO_DRIVE_CMD ioctl sense data check Date: Fri, 29 Mar 2013 10:09:52 -0700 Message-Id: <1364576992-17598-1-git-send-email-gwendal@google.com> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: References: X-Gm-Message-State: ALoCoQnWgkPlSyEfp7NhHSdcJYuYSc2JRAiXSWll5YvphIvfMLlsNyIY8V5XJDHuf65pZ0HsLJR4UApPsgL2rc1XPR6lqRL5EduR6p8Tz3VVpAVZpXCHXFXAgyGWPllfLBwcjC2sLZakSBzaCr4gCaeUXXVMxl26mdTwq6+kqR8L0IEyv6NHpK4OiQR9QMG5tRuaCdTKVkVgX94CRFwmdrXev9pECoEJEw== Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org commit 84a9a8cd9d0aa93c17e5815ab8a9cc4c0a765c63 changed the sense key used for returning task registers, but HDIO_DRIVE_CMD ioctl was not changed accordingly. Tested: check that SMART ENABLE sent using HDIO_DRIVE_CMD returns 0 instead of EIO. Change-Id: I84dccd3febb0467a83a39e55ecfdaaa9686332cd Signed-off-by: Gwendal Grignou --- drivers/ata/libata-scsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 318b413..5eae74b 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -532,8 +532,8 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) struct scsi_sense_hdr sshdr; scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE, &sshdr); - if (sshdr.sense_key == 0 && - sshdr.asc == 0 && sshdr.ascq == 0) + if (sshdr.sense_key == RECOVERED_ERROR && + sshdr.asc == 0 && sshdr.ascq == 0x1D) cmd_result &= ~SAM_STAT_CHECK_CONDITION; } @@ -618,8 +618,8 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) struct scsi_sense_hdr sshdr; scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE, &sshdr); - if (sshdr.sense_key == 0 && - sshdr.asc == 0 && sshdr.ascq == 0) + if (sshdr.sense_key == RECOVERED_ERROR && + sshdr.asc == 0 && sshdr.ascq == 0x1D) cmd_result &= ~SAM_STAT_CHECK_CONDITION; }