This reverts commit c3762b24.

The file this fixes is about to be reverted.
Reported-by: NAlan Cox <alan@linux.intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>