From patchwork Fri Mar 29 15:26:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 232458 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 D70812C00B8 for ; Sat, 30 Mar 2013 03:26:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754320Ab3C2Q0C (ORCPT ); Fri, 29 Mar 2013 12:26:02 -0400 Received: from mail-wg0-f73.google.com ([74.125.82.73]:62953 "EHLO mail-wg0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754007Ab3C2Q0B (ORCPT ); Fri, 29 Mar 2013 12:26:01 -0400 X-Greylist: delayed 3092 seconds by postgrey-1.27 at vger.kernel.org; Fri, 29 Mar 2013 12:26:01 EDT Received: by mail-wg0-f73.google.com with SMTP id l18so45914wgh.0 for ; Fri, 29 Mar 2013 09:26:00 -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=bXlf7AZ9wtJjC1OJKPJb4WhQOyqTcdA1a9jmyQICFwg=; b=W7VjqefEVWIS66x2l7m4rf8A95MkyweuAoWktuXdasDwJ62Smf6GF5gV8qZyk+3it7 etIzKBHH2lrHCr0hwmVpAHbO2iMUd2A2+SXRsU6pBpR2Qx+9S0Zdkh0Ghb3G9kldUDIJ vXwyxksFN/GZEjwR/7l6O64bI5/xCK8Xe91QXP+3B4sTqn2wqq3+Vcl+HG8YIUqWKY8m eg4JIIqFHS3gbmAdvYxXbKk9n0SI8MwVgVz14V1fpmVj86CRpbVkgwc/Pt7BpVgtXopP Bhv5yCqIWSvCLk7gwFIkeBtVNOJiZmTrulQldgnhXnxh+owoT7QLwE9swsKn1S5+mgFy qyEQ== 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=bXlf7AZ9wtJjC1OJKPJb4WhQOyqTcdA1a9jmyQICFwg=; b=brVLGKFXGS9NEptQY+hejardonAtWusDxsRER/P9d0DYysKqA0S/YMBlltzbMD9OG7 uGicLiMh5um6IdhzaZ3pmeNEO21fndmckggawpNk7NrXVAXdTRH4j3zMrt1rjNMN2sn9 QhWWMYBRvD2hE/BI1TM35bB7A193z6rpP2RwPZ8zmCGIsT5lyQnZFk0InX3K1vo4FRXN wsD1ibSy8BO2+ykVq8xL1ZlAXuc1KiBWyHgjIpZjVnA07VSsPdRkUtAnTFwY/V0yAYRL SBdstcT5Wmzt18qHRs9WE8rqHj64E2B/fAZy3stR3QsQpZjS1i8zrDWoM3VWfX9Xy3nV UNjQ== X-Received: by 10.14.0.196 with SMTP id 44mr4332556eeb.4.1364570805582; Fri, 29 Mar 2013 08:26:45 -0700 (PDT) Received: from corp2gmr1-2.eem.corp.google.com (corp2gmr1-2.eem.corp.google.com [172.25.138.117]) by gmr-mx.google.com with ESMTPS id 6si777740eej.0.2013.03.29.08.26.45 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Fri, 29 Mar 2013 08:26:45 -0700 (PDT) Received: from hippo3.mtv.corp.google.com (hippo3.mtv.corp.google.com [172.18.124.97]) by corp2gmr1-2.eem.corp.google.com (Postfix) with ESMTP id 555001E41F3; Fri, 29 Mar 2013 08:26:45 -0700 (PDT) Received: by hippo3.mtv.corp.google.com (Postfix, from userid 60833) id 8840620453; Fri, 29 Mar 2013 08:26:44 -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] [libata] Fix HDIO_DRIVE_CMD ioctl sense data check Date: Fri, 29 Mar 2013 08:26:41 -0700 Message-Id: <1364570801-6515-1-git-send-email-gwendal@google.com> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: References: X-Gm-Message-State: ALoCoQm46+F2nKqLVuV6/l1gOnTU9Acid/Z1jKEezyDCu638kfPalzVpzGMQcxGM65i9RofPhhtGW7UFqOntWTc8oadym+rdktqN3hzi9FwmhGpjKhLH7OloH6yn1+MUu6HOwLNqwHoM5SHUj0DssJAR8nhRQ65HAurzqjn/+GN3tJakAEhR3Ytx6tD+wjcbasJCizG9mF7UsWdkYq7ZPFIeqxZrffJnKA== 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. Signed-off-by: Gwendal Grignou --- drivers/ata/libata-scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 318b413..e05bf4c 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; }