Merge series from Andy Shevchenko <andriy.shevchenko@linux.intel.com>: The recent cleanup series broke the error path in the drivers. So fix it and do even more cleanups.
