---

yaml --- r: 321859 b: refs/heads/master c: 37a2d84 h: refs/heads/master i: 321857: 10fc768 321855: f16b8c1 v: v3
git-mirror · Aug 4, 2012 · 5a44204 · 5a44204
1 parent a9e39c9
commit 5a44204
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10ce0473e0de3ff8c091735f85c20fceace061cd
+refs/heads/master: 37a2d84a38df16e614bbfbb18a5155ebd8256938
diff --git a/trunk/drivers/spi/spi-omap2-mcspi.c b/trunk/drivers/spi/spi-omap2-mcspi.c
@@ -1228,18 +1228,16 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
 
 	status = spi_register_master(master);
 	if (status < 0)
-		goto err_spi_register;
+		goto disable_pm;
 
 	return status;
 
-err_spi_register:
-	spi_master_put(master);
 disable_pm:
 	pm_runtime_disable(&pdev->dev);
 dma_chnl_free:
 	kfree(mcspi->dma_channels);
 free_master:
-	kfree(master);
+	spi_master_put(master);
 	platform_set_drvdata(pdev, NULL);
 	return status;
 }