diff --git a/[refs] b/[refs]
index 535003d0bda3..30448f6d45e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0cb43b35d64877b2944bd37719708be5d7bbf99
+refs/heads/master: 1e1f421a8137824127a41303a30493356b5da638
diff --git a/trunk/drivers/ata/pata_at91.c b/trunk/drivers/ata/pata_at91.c
index 4b27617be26d..8561a9f195c1 100644
--- a/trunk/drivers/ata/pata_at91.c
+++ b/trunk/drivers/ata/pata_at91.c
@@ -312,11 +312,12 @@ static int __devinit pata_at91_probe(struct platform_device *pdev)
 static int __devexit pata_at91_remove(struct platform_device *pdev)
 {
 	struct ata_host *host = dev_get_drvdata(&pdev->dev);
-	struct at91_ide_info *info = host->private_data;
+	struct at91_ide_info *info;
 	struct device *dev = &pdev->dev;
 
 	if (!host)
 		return 0;
+	info = host->private_data;
 
 	ata_host_detach(host);