spi: sc18is602: Don't leak SPI master in probe error path

[linux-2.6-microblaze.git] / drivers / spi / spi-sc18is602.c

diff --git a/drivers/spi/spi-sc18is602.c b/drivers/spi/spi-sc18is602.c
index ee0f3ed..297c512 100644 (file)
--- a/drivers/spi/spi-sc18is602.c
+++ b/drivers/spi/spi-sc18is602.c
@@ -238,13 +238,12 @@ static int sc18is602_probe(struct i2c_client *client,
        struct sc18is602_platform_data *pdata = dev_get_platdata(dev);
        struct sc18is602 *hw;
        struct spi_master *master;
-       int error;
 
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C |
                                     I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
                return -EINVAL;
 
-       master = spi_alloc_master(dev, sizeof(struct sc18is602));
+       master = devm_spi_alloc_master(dev, sizeof(struct sc18is602));
        if (!master)
                return -ENOMEM;
 
@@ -298,15 +297,7 @@ static int sc18is602_probe(struct i2c_client *client,
        master->min_speed_hz = hw->freq / 128;
        master->max_speed_hz = hw->freq / 4;
 
-       error = devm_spi_register_master(dev, master);
-       if (error)
-               goto error_reg;
-
-       return 0;
-
-error_reg:
-       spi_master_put(master);
-       return error;
+       return devm_spi_register_master(dev, master);
 }
 
 static const struct i2c_device_id sc18is602_id[] = {