summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-02-06 12:29:43 +0300
committerBen Skeggs <bskeggs@redhat.com>2014-03-26 13:59:31 +1000
commitaa34efeddb6426c2d03214e65d6f31fbf7d413da (patch)
tree248954e3f4ca2b6ad267ca81c58010b1da0bfad3
parent4ac1b1a29f5d73aad47dfecc3e66577e8b79ad5a (diff)
downloadlinux-aa34efeddb6426c2d03214e65d6f31fbf7d413da.tar.gz
linux-aa34efeddb6426c2d03214e65d6f31fbf7d413da.tar.bz2
linux-aa34efeddb6426c2d03214e65d6f31fbf7d413da.zip
drm/nouveau/hwmon: remove some redundant checks
No need to check "ret" twice in a row. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_hwmon.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
index 4aff04fa483c..5e4ab58f4f6b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
@@ -587,18 +587,14 @@ nouveau_hwmon_init(struct drm_device *dev)
/* set the default attributes */
ret = sysfs_create_group(&hwmon_dev->kobj, &hwmon_default_attrgroup);
- if (ret) {
- if (ret)
- goto error;
- }
+ if (ret)
+ goto error;
/* if the card has a working thermal sensor */
if (therm->temp_get(therm) >= 0) {
ret = sysfs_create_group(&hwmon_dev->kobj, &hwmon_temp_attrgroup);
- if (ret) {
- if (ret)
- goto error;
- }
+ if (ret)
+ goto error;
}
/* if the card has a pwm fan */