summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorRhyland Klein <rklein@nvidia.com>2012-08-02 15:29:35 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 12:31:04 -0700
commit1785ec5e530fbf92b2e8a6663e9518f099acabb1 (patch)
tree329c7ad19d7347b3e924135a3ee24fbf316021aa /sound/usb
parent9b2716aab81cfa943b1250cb0c4c8dddcbb1d0ef (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> Rebase-Id: R072eabbacf2c8ac4175629cf8923d32f53d2b556
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 e51538b668a9..080ae81ba8b0 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -799,7 +799,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;