diff --git a/[refs] b/[refs]
index aca048c833b4..d3e80a91711e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8773531cc54c1ed10c8ec301353ee6b53b601a5
+refs/heads/master: 1552945669b4fb23bff8d3b30221bfe3ade63515
diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h
index d98e8b50e20c..86cc0491b35e 100644
--- a/trunk/include/linux/libata.h
+++ b/trunk/include/linux/libata.h
@@ -1182,9 +1182,11 @@ static inline u8 ata_wait_idle(struct ata_port *ap)
 {
 	u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
 
+#ifdef ATA_DEBUG
 	if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ)))
-		DPRINTK("ATA: abnormal status 0x%X on port 0x%p\n",
-			status, ap->ioaddr.status_addr);
+		ata_port_printk(ap, KERN_DEBUG, "abnormal Status 0x%X\n",
+				status);
+#endif
 
 	return status;
 }