summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-02-19 13:46:56 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2015-02-19 13:46:56 +1100
commit9fd3d4c47afbd6aa8ec5cc07a4e9472c4f1c2c44 (patch)
treeffce74231115e935db5e25650d98e234082975df
parent32ad370c2a833f2be7bd38230286273487890fa2 (diff)
parentf034125dfdae466b3e6ad155e722de48d64b82d4 (diff)
Merge remote-tracking branch 'hsi/for-next'
-rw-r--r--drivers/hsi/clients/nokia-modem.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hsi/clients/nokia-modem.c b/drivers/hsi/clients/nokia-modem.c
index eb4dc63dbc9..9be4867fa22 100644
--- a/drivers/hsi/clients/nokia-modem.c
+++ b/drivers/hsi/clients/nokia-modem.c
@@ -200,6 +200,7 @@ static int nokia_modem_probe(struct device *dev)
modem->ssi_protocol = hsi_new_client(port, &ssip);
if (!modem->ssi_protocol) {
dev_err(dev, "Could not register ssi-protocol device\n");
+ err = -ENOMEM;
goto error2;
}