Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[deliverable/linux.git] / drivers / hwmon / w83627hf.c

diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index b257c7223733c3fa1f9719bf0721bdd79425204c..38e2805230711f0b1b02e243b34dc62e4792c282 100644 (file)
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -1135,6 +1135,7 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr,
                "W83687THF",
        };
 
+       sio_data->sioaddr = sioaddr;
        superio_enter(sio_data);
        val = force_id ? force_id : superio_inb(sio_data, DEVID);
        switch (val) {
@@ -1177,7 +1178,6 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr,
        }
 
        err = 0;
-       sio_data->sioaddr = sioaddr;
        pr_info(DRVNAME ": Found %s chip at %#x\n",
                names[sio_data->type], *addr);