diff --git a/[refs] b/[refs]
index 41383bd6a518..952cf3c934f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc9967576829a01c98e5388410dc12c61006f79f
+refs/heads/master: 93b760b7072ca6972c15c798e97af3f830d8bbba
diff --git a/trunk/sound/soc/codecs/wm8731.c b/trunk/sound/soc/codecs/wm8731.c
index a2c478e53d54..4191bdb803bf 100644
--- a/trunk/sound/soc/codecs/wm8731.c
+++ b/trunk/sound/soc/codecs/wm8731.c
@@ -655,12 +655,17 @@ static int __devinit wm8731_spi_probe(struct spi_device *spi)
 	codec->hw_write = (hw_write_t)wm8731_spi_write;
 	codec->dev = &spi->dev;
 
+	spi->dev.driver_data = wm8731;
+
 	return wm8731_register(wm8731);
 }
 
 static int __devexit wm8731_spi_remove(struct spi_device *spi)
 {
-	/* FIXME: This isn't actually implemented... */
+	struct wm8731_priv *wm8731 = spi->dev.driver_data;
+
+	wm8731_unregister(wm8731);
+
 	return 0;
 }