diff --git a/[refs] b/[refs]
index 425b3305bfaa..fed4a6b5f23c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0d5d6e55340348b0de75eb691b93d7e60dba879
+refs/heads/master: ef6c680dc5a182a79b09567168d6713f46c85784
diff --git a/trunk/drivers/spi/spi_s3c64xx.c b/trunk/drivers/spi/spi_s3c64xx.c
index 3acf38119e96..0e883f9c720b 100644
--- a/trunk/drivers/spi/spi_s3c64xx.c
+++ b/trunk/drivers/spi/spi_s3c64xx.c
@@ -1097,7 +1097,8 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
 	iounmap((void *) sdd->regs);
 
 	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	release_mem_region(mem_res->start, resource_size(mem_res));
+	if (mem_res != NULL)
+		release_mem_region(mem_res->start, resource_size(mem_res));
 
 	platform_set_drvdata(pdev, NULL);
 	spi_master_put(master);