Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58058
b: refs/heads/master
c: 55f3952
h: refs/heads/master
v: v3
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Jun 27, 2007
1 parent 01c279a commit ed7aaf9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 62877f6b0c4943c2231b84b49182a078eb02a777
refs/heads/master: 55f3952d45a439cecc36fd845a87026d04c82931
8 changes: 3 additions & 5 deletions trunk/include/linux/libata.h
Original file line number Diff line number Diff line change
Expand Up @@ -1088,11 +1088,9 @@ static inline u8 ata_wait_idle(struct ata_port *ap)
{
u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);

if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ))) {
if (ata_msg_warn(ap))
printk(KERN_WARNING "ATA: abnormal status 0x%X on port 0x%p\n",
status, ap->ioaddr.status_addr);
}
if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ)))
DPRINTK("ATA: abnormal status 0x%X on port 0x%p\n",
status, ap->ioaddr.status_addr);

return status;
}
Expand Down

0 comments on commit ed7aaf9

Please sign in to comment.