Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[firefly-linux-kernel-4.4.55.git] / sound / isa / cmi8328.c

diff --git a/sound/isa/cmi8328.c b/sound/isa/cmi8328.c
index 4778852a1201388645d15c54f4f67cbd2abd3142..2c89d95da674658f780ea475b0f2b3d55f59f0fc 100644 (file)
--- a/sound/isa/cmi8328.c
+++ b/sound/isa/cmi8328.c
@@ -307,7 +307,7 @@ static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
        if (err < 0)
                goto error;
 
-       err = snd_wss_pcm(cmi->wss, 0, NULL);
+       err = snd_wss_pcm(cmi->wss, 0);
        if (err < 0)
                goto error;
 
@@ -318,7 +318,7 @@ static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
        if (err < 0)
                goto error;
 
-       if (snd_wss_timer(cmi->wss, 0, NULL) < 0)
+       if (snd_wss_timer(cmi->wss, 0) < 0)
                snd_printk(KERN_WARNING "error initializing WSS timer\n");
 
        if (mpuport[ndev] == SNDRV_AUTO_PORT) {