Incoportate RP's patch, which seems to be lost when update. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>