From e60a491b1ba95bd4d175b87d9e13fd7bca34f96d Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 14 May 2010 17:23:37 -0400 Subject: [PATCH] --- yaml --- r: 192605 b: refs/heads/master c: 55787183ade44c4f826f581a068f52a1a80c6a2e h: refs/heads/master i: 192603: d4ea5cfda42296ea7e8e409cff1f347e5c25c9d9 v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci_platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a1663936d098..a132984c81f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c06231661e4fb5f2f50c73ff33702937a11764cf +refs/heads/master: 55787183ade44c4f826f581a068f52a1a80c6a2e diff --git a/trunk/drivers/ata/ahci_platform.c b/trunk/drivers/ata/ahci_platform.c index 19bfd1d76d40..5e11b160f247 100644 --- a/trunk/drivers/ata/ahci_platform.c +++ b/trunk/drivers/ata/ahci_platform.c @@ -125,7 +125,7 @@ static int __init ahci_probe(struct platform_device *pdev) /* set enclosure management message type */ if (ap->flags & ATA_FLAG_EM) - ap->em_message_type = ahci_em_messages; + ap->em_message_type = hpriv->em_msg_type; /* disabled/not-implemented port */ if (!(hpriv->port_map & (1 << i)))