Merge tag 'fcoe' into for-linus

[firefly-linux-kernel-4.4.55.git] / sound / parisc / harmony.c

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 0e66ba48d453fd9e81e431623320d8e86f3ad758..67f56a2cee6aec83bd4710f645a82cdca9e39847 100644 (file)
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -902,8 +902,6 @@ snd_harmony_free(struct snd_harmony *h)
        if (h->iobase)
                iounmap(h->iobase);
 
-       parisc_set_drvdata(h->dev, NULL);
-
        kfree(h);
        return 0;
 }
@@ -1016,7 +1014,6 @@ static int
 snd_harmony_remove(struct parisc_device *padev)
 {
        snd_card_free(parisc_get_drvdata(padev));
-       parisc_set_drvdata(padev, NULL);
        return 0;
 }