summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorRhyland Klein <rklein@nvidia.com>2012-08-02 15:29:35 -0400
committerSimone Willett <swillett@nvidia.com>2012-08-03 14:01:36 -0700
commit991fbf047fca8a4fa729d090b5c3f65a89acb9ba (patch)
tree0c4f6f0f76847a3045fae678b3742de0ef86ab18 /sound/usb
parentc5dea888253285e23107585805b7728ebe46e17e (diff)
ALSA: usb-audio: fix compilation error
change 8843c49092b6ed903e88eded1f1c9b9a7f432dfe introduced a compliation error if CONFIG_SWITCH is not enabled. Signed-off-by: Rhyland Klein <rklein@nvidia.com> Change-Id: I4b4c547394f424bd90837726b08d9feccd4207de Reviewed-on: http://git-master/r/120444 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com> Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/card.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c
index fca3f56fbb30..d5201ca996e4 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -755,7 +755,9 @@ static int __init snd_usb_audio_init(void)
err = usb_register(&usb_audio_driver);
if (err) {
+#ifdef CONFIG_SWITCH
switch_dev_unregister(&usb_switch_dev);
+#endif
}
return err;