From patchwork Sun Dec 18 20:37:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 5844 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A967323E2D for ; Sun, 18 Dec 2011 20:38:14 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id A1046A1828D for ; Sun, 18 Dec 2011 20:38:14 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id c11so1269910eaa.11 for ; Sun, 18 Dec 2011 12:38:14 -0800 (PST) Received: by 10.204.133.207 with SMTP id g15mr4260079bkt.17.1324240694422; Sun, 18 Dec 2011 12:38:14 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.204.40.4 with SMTP id i4cs108684bke; Sun, 18 Dec 2011 12:38:14 -0800 (PST) Received: by 10.180.104.70 with SMTP id gc6mr22858469wib.42.1324240693149; Sun, 18 Dec 2011 12:38:13 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id cr8si9206970wib.12.2011.12.18.12.38.12 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 18 Dec 2011 12:38:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RcNUe-00070c-Qs; Sun, 18 Dec 2011 20:38:00 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 07/10] hw/sd.c: Set ILLEGAL_COMMAND for ACMDs in invalid state Date: Sun, 18 Dec 2011 20:37:57 +0000 Message-Id: <1324240680-26905-8-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1324240680-26905-1-git-send-email-peter.maydell@linaro.org> References: <1324240680-26905-1-git-send-email-peter.maydell@linaro.org> App commands in an invalid state should set ILLEGAL_COMMAND, not merely return a zero response. Signed-off-by: Peter Maydell --- hw/sd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/sd.c b/hw/sd.c index 9116f67..9eebfac 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -1262,7 +1262,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd, } fprintf(stderr, "SD: ACMD%i in a wrong state\n", req.cmd); - return sd_r0; + return sd_illegal; } static int cmd_valid_while_locked(SDState *sd, SDRequest *req)