diff --git a/[refs] b/[refs]
index 884543fb86e1..51ed3d0a8950 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25eb650a690b95cb0e2cf0c3b03f4900a59e0135
+refs/heads/master: 323c9dd26b6176fd7f16bcf3202df708c419b20c
diff --git a/trunk/sound/soc/fsl/fsl_ssi.c b/trunk/sound/soc/fsl/fsl_ssi.c
index 6a882aa55530..313e0ccedd5b 100644
--- a/trunk/sound/soc/fsl/fsl_ssi.c
+++ b/trunk/sound/soc/fsl/fsl_ssi.c
@@ -678,7 +678,7 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev)
 		kfree(ssi_private);
 		return ret;
 	}
-	ssi_private->ssi = ioremap(res.start, resource_size(&res));
+	ssi_private->ssi = ioremap(res.start, 1 + res.end - res.start);
 	ssi_private->ssi_phys = res.start;
 	ssi_private->irq = irq_of_parse_and_map(np, 0);