Merge "diag: Free usb buffer's entry after removing from list"