Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 315998
b: refs/heads/master
c: 661f020
h: refs/heads/master
v: v3
  • Loading branch information
Guenter Roeck committed Jul 22, 2012
1 parent 53deb47 commit 277577e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4a8ad25af56fa55746a97c4f48985154eb82a842
refs/heads/master: 661f020f56c698be9cf40f0b3c8963c2d15be0dd
9 changes: 3 additions & 6 deletions trunk/drivers/hwmon/max1111.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@ static int __devinit max1111_probe(struct spi_device *spi)
if (err < 0)
return err;

data = kzalloc(sizeof(struct max1111_data), GFP_KERNEL);
data = devm_kzalloc(&spi->dev, sizeof(struct max1111_data), GFP_KERNEL);
if (data == NULL) {
dev_err(&spi->dev, "failed to allocate memory\n");
return -ENOMEM;
}

err = setup_transfer(data);
if (err)
goto err_free_data;
return err;

mutex_init(&data->drvdata_lock);

Expand All @@ -186,7 +186,7 @@ static int __devinit max1111_probe(struct spi_device *spi)
err = sysfs_create_group(&spi->dev.kobj, &max1111_attr_group);
if (err) {
dev_err(&spi->dev, "failed to create attribute group\n");
goto err_free_data;
return err;
}

data->hwmon_dev = hwmon_device_register(&spi->dev);
Expand All @@ -203,8 +203,6 @@ static int __devinit max1111_probe(struct spi_device *spi)

err_remove:
sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group);
err_free_data:
kfree(data);
return err;
}

Expand All @@ -215,7 +213,6 @@ static int __devexit max1111_remove(struct spi_device *spi)
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group);
mutex_destroy(&data->drvdata_lock);
kfree(data);
return 0;
}

Expand Down

0 comments on commit 277577e

Please sign in to comment.