From 9767fbd648d7895ea2b3966c45ad5f9f653e36f9 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 3 May 2013 15:21:46 +0100 Subject: [PATCH] --- yaml --- r: 376040 b: refs/heads/master c: a5017b962059f7cec8f6d2dfb286ef3fbfbaab82 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dda42497a48e..c7aa805685e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab2273c62dbec17432d40d2a78ce380f3d34a216 +refs/heads/master: a5017b962059f7cec8f6d2dfb286ef3fbfbaab82 diff --git a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c index fe667dde43ce..386362c9964f 100644 --- a/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +++ b/trunk/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c @@ -1087,7 +1087,11 @@ static int synaptics_rmi4_resume(struct device *dev) unsigned char intr_status; struct synaptics_rmi4_data *rmi4_data = dev_get_drvdata(dev); - regulator_enable(rmi4_data->regulator); + retval = regulator_enable(rmi4_data->regulator); + if (retval) { + dev_err(dev, "Regulator enable failed (%d)\n", retval); + return retval; + } enable_irq(rmi4_data->i2c_client->irq); rmi4_data->touch_stopped = false;