From a5fcda903c132124873ae0a965c1fd81789aa31a Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 21 Sep 2011 11:16:01 +0100 Subject: 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 Acked-by: Andrew Chew Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman Signed-off-by: Dan Willemsen Reviewed-on: http://git-master/r/83532 Reviewed-by: Andrew Chew Reviewed-by: Allen Martin --- drivers/staging/iio/magnetometer/ak8975.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') 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); -- cgit v1.2.3