diff --git a/[refs] b/[refs]
index 633e6a9f637b..17ccda3f9d2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95362fa90312ff2d52c0b4d42412cd7ceeb3b89b
+refs/heads/master: 7b92ff01c2cd21567c3342c1c77d5e4f1a2bd699
diff --git a/trunk/drivers/spi/spi_butterfly.c b/trunk/drivers/spi/spi_butterfly.c
index c2f601f8e4f2..312987a03210 100644
--- a/trunk/drivers/spi/spi_butterfly.c
+++ b/trunk/drivers/spi/spi_butterfly.c
@@ -251,6 +251,8 @@ static void butterfly_attach(struct parport *p)
 	 * setting up a platform device like this is an ugly kluge...
 	 */
 	pdev = platform_device_register_simple("butterfly", -1, NULL, 0);
+	if (IS_ERR(pdev))
+		return;
 
 	master = spi_alloc_master(&pdev->dev, sizeof *pp);
 	if (!master) {