summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-09-21 11:16:01 +0100
committerSimone Willett <swillett@nvidia.com>2012-02-18 10:58:22 -0800
commita5fcda903c132124873ae0a965c1fd81789aa31a (patch)
treea2468d9428092675d4cc903ac69d1af974a70b31 /drivers/staging
parent0a57a174957a81bf870fe43f91ded27b0401ccc7 (diff)
staging:iio:magnetometer:ak8975: Fix probe() error-handling
Fix ak8975_probe() to jump to the appropriate exit labels when an error occurs. With the previous code, some cleanup actions were being skipped for some error conditions. Upstream v3.2 commit ad31d250bf60c8e4c990e8b0daeedbaa2d6884a9 Change-Id: Ib0ef38f154fbcf18604ad283f51f040b5e038c65 Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Andrew Chew <achew@nvidia.com> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com> Reviewed-on: http://git-master/r/83532 Reviewed-by: Andrew Chew <achew@nvidia.com> Reviewed-by: Allen Martin <amartin@nvidia.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/iio/magnetometer/ak8975.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c
index 6d87503f5621..c56577540b87 100644
--- a/drivers/staging/iio/magnetometer/ak8975.c
+++ b/drivers/staging/iio/magnetometer/ak8975.c
@@ -533,7 +533,7 @@ static int ak8975_probe(struct i2c_client *client,
err = ak8975_setup(client);
if (err < 0) {
dev_err(&client->dev, "AK8975 initialization fails\n");
- goto exit_gpio;
+ goto exit_free_iio;
}
err = iio_device_register(indio_dev);