Merge "ngd_slim: Ignore pm_runtime_get error when runtime-pm is not enabled"

This commit is contained in:
Linux Build Service Account 2014-10-11 14:53:34 -07:00 committed by Gerrit - the friendly Code Review server
commit ef65849b06

View file

@ -369,7 +369,7 @@ static int ngd_xfer_msg(struct slim_controller *ctrl, struct slim_msg_txn *txn)
* Setting runtime status to suspended clears the error
* It also makes HW status cosistent with what SW has it here
*/
if (ret < 0) {
if (pm_runtime_enabled(dev->dev) && ret < 0) {
SLIM_ERR(dev, "slim ctrl vote failed ret:%d, state:%d",
ret, dev->state);
pm_runtime_set_suspended(dev->dev);