Fix two occurrences of the Sparse warning:

warning: symbol XXX shadows an earlier one
Signed-off-by: NKris Borer <kborer@gmail.com>
Reviewed-by: NFelipe Balbi <balbi@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>