Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / sound / pci / ctxfi / ctpcm.c

diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c
index 60ea231..d0dc227 100644 (file)
--- a/sound/pci/ctxfi/ctpcm.c
+++ b/sound/pci/ctxfi/ctpcm.c
@@ -97,7 +97,7 @@ static void ct_atc_pcm_interrupt(struct ct_atc_pcm *atc_pcm)
 {
        struct ct_atc_pcm *apcm = atc_pcm;
 
-       if (NULL == apcm->substream)
+       if (!apcm->substream)
                return;
 
        snd_pcm_period_elapsed(apcm->substream);
@@ -123,7 +123,7 @@ static int ct_pcm_playback_open(struct snd_pcm_substream *substream)
        int err;
 
        apcm = kzalloc(sizeof(*apcm), GFP_KERNEL);
-       if (NULL == apcm)
+       if (!apcm)
                return -ENOMEM;
 
        apcm->substream = substream;
@@ -271,7 +271,7 @@ static int ct_pcm_capture_open(struct snd_pcm_substream *substream)
        int err;
 
        apcm = kzalloc(sizeof(*apcm), GFP_KERNEL);
-       if (NULL == apcm)
+       if (!apcm)
                return -ENOMEM;
 
        apcm->started = 0;