i2c: core: only use set_scl for bus recovery after calling prepare_recovery
authorJan Luebbe <jlu@pengutronix.de>
Wed, 8 Jul 2015 14:35:06 +0000 (16:35 +0200)
committerWolfram Sang <wsa@the-dreams.de>
Fri, 31 Jul 2015 11:32:31 +0000 (13:32 +0200)
commit8b06260836ab47abbb5ea49d889660a0ed8adf90
tree743827d5440c9513a0bae63d5f3cc0acf7ea2938
parentd12c0aaf3780c5b26b4ea9e795252381f586c063
i2c: core: only use set_scl for bus recovery after calling prepare_recovery

Using set_scl may be ineffective before calling the driver specific
prepare_recovery callback, which might change into a test mode. So
instead of setting SCL in i2c_generic_scl_recovery, move it to
i2c_generic_recovery (after the optional prepare_recovery).

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Acked-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Tested-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/i2c-core.c