Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / usb / gadget / u_audio.c

diff --git a/drivers/usb/gadget/u_audio.c b/drivers/usb/gadget/u_audio.c
index 7a86d2c9109c6bae8341e4d659792a9315d1a19f..59ffe1ecf1c9ad92d01cd020ca7ac73e36f9734b 100644 (file)
--- a/drivers/usb/gadget/u_audio.c
+++ b/drivers/usb/gadget/u_audio.c
@@ -255,6 +255,7 @@ static int gaudio_open_snd_dev(struct gaudio *card)
                ERROR(card, "No such PCM capture device: %s\n", fn_cap);
                snd->substream = NULL;
                snd->card = NULL;
+               snd->filp = NULL;
        } else {
                pcm_file = snd->filp->private_data;
                snd->substream = pcm_file->substream;
@@ -273,17 +274,17 @@ static int gaudio_close_snd_dev(struct gaudio *gau)
 
        /* Close control device */
        snd = &gau->control;
-       if (!IS_ERR(snd->filp))
+       if (snd->filp)
                filp_close(snd->filp, current->files);
 
        /* Close PCM playback device and setup substream */
        snd = &gau->playback;
-       if (!IS_ERR(snd->filp))
+       if (snd->filp)
                filp_close(snd->filp, current->files);
 
        /* Close PCM capture device and setup substream */
        snd = &gau->capture;
-       if (!IS_ERR(snd->filp))
+       if (snd->filp)
                filp_close(snd->filp, current->files);
 
        return 0;
@@ -304,8 +305,7 @@ int __init gaudio_setup(struct gaudio *card)
        ret = gaudio_open_snd_dev(card);
        if (ret)
                ERROR(card, "we need at least one control device\n");
-
-       if (!the_card)
+       else if (!the_card)
                the_card = card;
 
        return ret;