From e845f540bb1c1588bfb40c34e7bbcf057e2b8439 Mon Sep 17 00:00:00 2001 From: nedko Date: Thu, 23 Oct 2008 21:10:24 +0000 Subject: [PATCH] Apply patch by kfoltman that fixes #95 In 2375, usx2y ALSA driver was deactivated. However the way it was done causes driver->hw to stay NULL and then referenced. This causes SIGSEGV, as described in #95 description. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3036 0c269be4-1314-0410-8aa9-9f06e86f4224 --- linux/alsa/JackAlsaDriver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 785cd954..2e336b8c 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -204,11 +204,11 @@ JackAlsaDriver::alsa_driver_hw_specific (alsa_driver_t *driver, int hw_monitorin if ((err = alsa_driver_ice1712_hardware (driver)) != 0) { return err; } - } else if (!strcmp(driver->alsa_driver, "USB US-X2Y")) { + } /*else if (!strcmp(driver->alsa_driver, "USB US-X2Y")) { if ((err = alsa_driver_usx2y_hardware (driver)) != 0) { return err; } - } else { + } */else { if ((err = alsa_driver_generic_hardware (driver)) != 0) { return err; }