Merge "usb: diag: Avoid NULL pointer dereference in debugfs" into msm-3.0