We were exitting the function before actually
renaming anything. While at that, also always leave
control endpoint un-renamed.
Signed-off-by: NFelipe Balbi <felipe.balbi@linux.intel.com>