1 files changed, 6 insertions, 1 deletions

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index a2c478e53d5..4191bdb803b 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/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;
 }