summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/windfarm_smu_sat.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-01 05:45:41 +0200
committerJeff Garzik <jeff@garzik.org>2006-10-01 05:45:41 +0200
commit1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch)
tree64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /drivers/macintosh/windfarm_smu_sat.c
parentMerge branch 'master' into upstream (diff)
parent[PATCH] SCSI: fix request flag-related build breakage (diff)
downloadlinux-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.tar.xz
linux-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.zip
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/macintosh/windfarm_smu_sat.c')
-rw-r--r--drivers/macintosh/windfarm_smu_sat.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index aceb61d9fbc8..83f79de7174b 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -397,12 +397,7 @@ static int wf_sat_detach(struct i2c_client *client)
static int __init sat_sensors_init(void)
{
- int err;
-
- err = i2c_add_driver(&wf_sat_driver);
- if (err < 0)
- return err;
- return 0;
+ return i2c_add_driver(&wf_sat_driver);
}
static void __exit sat_sensors_exit(void)