diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 56f0af2083456425ff9ff0d5e17db7bf9bad5584..31b65e0da0b1a3651e5486862ee5d4c65ee73375 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -4749,6 +4749,7 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host,
 
 	for (i = 0; i < ATA_MAX_DEVICES; i++) {
 		struct ata_device *dev = &ap->device[i];
+		dev->ap = ap;
 		dev->devno = i;
 		dev->pio_mask = UINT_MAX;
 		dev->mwdma_mask = UINT_MAX;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index cd467cd54473e60c66027cc335a6de07f41cd04c..ac2d2cc78b1073a05519233b5308e2ebd7a4cb98 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -358,6 +358,7 @@ struct ata_host_stats {
 };
 
 struct ata_device {
+	struct ata_port		*ap;
 	u64			n_sectors;	/* size of device, if ATA */
 	unsigned long		flags;		/* ATA_DFLAG_xxx */
 	unsigned int		class;		/* ATA_DEV_xxx */