From 0d6607f08941880036aa6f32ebfe0d0b439107ce Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Mon, 25 Jun 2007 23:34:02 +0900
Subject: [PATCH] --- yaml --- r: 58063 b: refs/heads/master c:
 09d7f9b0658072485a93247e1b6e15e661f860d2 h: refs/heads/master i:   58061:
 dd4fd56410f63b533300c345835d573f66a8e346   58059:
 e536eb18cdcd351950abc48a4b2df14eb90c09fb   58055:
 00624238f36862dfe69ad7a719c47dc5cc24d3d4   58047:
 de7fad40e60a9de47897ea9a0194a622c530db76 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/libata-core.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 24c244dbd973..ebd266116469 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 112cc2b510156494918abdf877111dfd56e5643b
+refs/heads/master: 09d7f9b0658072485a93247e1b6e15e661f860d2
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index deda68446b43..642097a7d60d 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -600,8 +600,9 @@ static const char *sata_spd_string(unsigned int spd)
 
 void ata_dev_disable(struct ata_device *dev)
 {
-	if (ata_dev_enabled(dev) && ata_msg_drv(dev->ap)) {
-		ata_dev_printk(dev, KERN_WARNING, "disabled\n");
+	if (ata_dev_enabled(dev)) {
+		if (ata_msg_drv(dev->ap))
+			ata_dev_printk(dev, KERN_WARNING, "disabled\n");
 		ata_down_xfermask_limit(dev, ATA_DNXFER_FORCE_PIO0 |
 					     ATA_DNXFER_QUIET);
 		dev->class++;