---

yaml --- r: 328609 b: refs/heads/master c: 5bee3b9 h: refs/heads/master i: 328607: df58c5f v: v3
git-mirror · Sep 25, 2012 · 4790eed · 4790eed
1 parent f7e36f3
commit 4790eed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec155afa82cb10d97b6c10d6ede5b0ffa321e816
+refs/heads/master: 5bee3b94d945851d6cb624a5e6808d9a815ebca0
diff --git a/trunk/drivers/spi/spi-s3c64xx.c b/trunk/drivers/spi/spi-s3c64xx.c
@@ -976,7 +976,8 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
 	spi_set_ctldata(spi, NULL);
 
 err_gpio_req:
-	kfree(cs);
+	if (spi->dev.of_node)
+		kfree(cs);
 
 	return err;
 }