Merge "USB: Use USB QDSS data over SW path on parrot"
diff --git a/etc/init.qcom.usb.sh b/etc/init.qcom.usb.sh
index 2d739c4..fb05215 100644
--- a/etc/init.qcom.usb.sh
+++ b/etc/init.qcom.usb.sh
@@ -140,7 +140,11 @@
if [ -d /config/usb_gadget ]; then
# Chip-serial is used for unique MSM identification in Product string
msm_serial=`cat /sys/devices/soc0/serial_number`;
- msm_serial_hex=`printf %08X $msm_serial`
+ # If MSM serial number is not available, then keep it blank instead of 0x00000000
+ if [ "$msm_serial" != "" ]; then
+ msm_serial_hex=`printf %08X $msm_serial`
+ fi
+
machine_type=`cat /sys/devices/soc0/machine`
setprop vendor.usb.product_string "$machine_type-$soc_hwplatform _SN:$msm_serial_hex"