summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHsin-Yu Chao <hychao@chromium.org>2017-01-16 15:26:30 +0800
committerchrome-bot <chrome-bot@chromium.org>2017-01-16 05:30:41 -0800
commit18308017be1c374c0b8577844903556be9c12821 (patch)
treee16399db2f3d1c55506716bb52dbecf1cdb1a343
parent2a31c92503421def21d141b16acc788d89c5b9cf (diff)
downloadadhd-18308017be1c374c0b8577844903556be9c12821.tar.gz
CRAS: Ignore empty ucm suffix argument
UCM suffix is used for CRAS to choose UCM config customized for specific device. We should treat the empty suffix case as not specified. BUG=chromium:680701 TEST=verify UCM is loaded on Reef Change-Id: Ib498cc385e650a360a3bb26974ec0acb5a17c72a Reviewed-on: https://chromium-review.googlesource.com/428670 Commit-Ready: Hsinyu Chao <hychao@chromium.org> Tested-by: Hsinyu Chao <hychao@chromium.org> Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
-rw-r--r--cras/src/server/cras.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cras/src/server/cras.c b/cras/src/server/cras.c
index 25656707..29806a81 100644
--- a/cras/src/server/cras.c
+++ b/cras/src/server/cras.c
@@ -84,7 +84,8 @@ int main(int argc, char **argv)
}
break;
case 'u':
- internal_ucm_suffix = optarg;
+ if (*optarg != 0)
+ internal_ucm_suffix = optarg;
break;
default:
break;