From 6996d4ec456a4a13a10da430d6ae3948946d1386 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 18 Apr 2012 11:11:57 +0100 Subject: [PATCH] --- yaml --- r: 307945 b: refs/heads/master c: 48b332f9916f33ba0001b78e5cea49ef17f3c81e h: refs/heads/master i: 307943: d165301404221d2282248dad65748468f44f68c0 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9cde277915d7..eb88e4da745d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca5879d3ffebd967e94b2dc3b1a3dc089709206f +refs/heads/master: 48b332f9916f33ba0001b78e5cea49ef17f3c81e diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index 4254b6f310aa..d15b149649bf 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -2042,7 +2042,9 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev) err_alloc: omap_hsmmc_gpio_free(pdata); err: - release_mem_region(res->start, resource_size(res)); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (res) + release_mem_region(res->start, resource_size(res)); return ret; }