1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index b4abd6850367..dce65651d858 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2340,7 +2340,8 @@ unsigned int ata_busy_sleep (struct ata_port *ap,
 
         if (status & ATA_BUSY)
                 ata_port_printk(ap, KERN_WARNING,
-                                "port is slow to respond, please be patient\n");
+                                "port is slow to respond, please be patient "
+                                "(Status 0x%x)\n", status);
 
         timeout = timer_start + tmout;
         while ((status & ATA_BUSY) && (time_before(jiffies, timeout))) {
@@ -2350,7 +2351,8 @@ unsigned int ata_busy_sleep (struct ata_port *ap,
 
         if (status & ATA_BUSY) {
                 ata_port_printk(ap, KERN_ERR, "port failed to respond "
-                                "(%lu secs)\n", tmout / HZ);
+                                "(%lu secs, Status 0x%x)\n",
+                                tmout / HZ, status);
                 return 1;
         }
 
@@ -5478,11 +5480,10 @@ int ata_device_add(const struct ata_probe_ent *ent)
                 int irq_line = ent->irq;
 
                 ap = ata_port_add(ent, host, i);
+                host->ports[i] = ap;
                 if (!ap)
                         goto err_out;
 
-                host->ports[i] = ap;
-
                 /* dummy? */
                 if (ent->dummy_port_mask & (1 << i)) {
                         ata_port_printk(ap, KERN_INFO, "DUMMY\n");
@@ -5740,7 +5741,7 @@ void ata_host_remove(struct ata_host *host)
 
 /**
  *      ata_scsi_release - SCSI layer callback hook for host unload
- *      @host: libata host to be unloaded
+ *      @shost: libata host to be unloaded
  *
  *      Performs all duties necessary to shut down a libata port...
  *      Kill port kthread, disable port, and release resources.
@@ -5786,6 +5787,7 @@ ata_probe_ent_alloc(struct device *dev, const struct ata_port_info *port)
         probe_ent->mwdma_mask = port->mwdma_mask;
         probe_ent->udma_mask = port->udma_mask;
         probe_ent->port_ops = port->port_ops;
+        probe_ent->private_data = port->private_data;
 
         return probe_ent;
 }