1 files changed, 13 insertions, 8 deletions

diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index 7f6f7280878d..494274d27f01 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -142,10 +142,14 @@ superio_exit(void)
 #define WINB_BASE_REG 0x60
 /* Constants specified below */
 
-/* Length of ISA address segment */
-#define WINB_EXTENT 8
+/* Alignment of the base address */
+#define WINB_ALIGNMENT          ~7
 
-/* Where are the ISA address/data registers relative to the base address */
+/* Offset & size of I/O region we are interested in */
+#define WINB_REGION_OFFSET      5
+#define WINB_REGION_SIZE        2
+
+/* Where are the sensors address/data registers relative to the base address */
 #define W83781D_ADDR_REG_OFFSET 5
 #define W83781D_DATA_REG_OFFSET 6
 
@@ -981,7 +985,7 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr)
         superio_select(W83627HF_LD_HWM);
         val = (superio_inb(WINB_BASE_REG) << 8) |
                superio_inb(WINB_BASE_REG + 1);
-        *addr = val & ~(WINB_EXTENT - 1);
+        *addr = val & WINB_ALIGNMENT;
         if (*addr == 0 && force_addr == 0) {
                 superio_exit();
                 return -ENODEV;
@@ -1000,9 +1004,10 @@ static int w83627hf_detect(struct i2c_adapter *adapter)
         const char *client_name = "";
 
         if(force_addr)
-                address = force_addr & ~(WINB_EXTENT - 1);
+                address = force_addr & WINB_ALIGNMENT;
 
-        if (!request_region(address, WINB_EXTENT, w83627hf_driver.name)) {
+        if (!request_region(address + WINB_REGION_OFFSET, WINB_REGION_SIZE,
+                            w83627hf_driver.name)) {
                 err = -EBUSY;
                 goto ERROR0;
         }
@@ -1148,7 +1153,7 @@ static int w83627hf_detect(struct i2c_adapter *adapter)
       ERROR2:
         kfree(data);
       ERROR1:
-        release_region(address, WINB_EXTENT);
+        release_region(address + WINB_REGION_OFFSET, WINB_REGION_SIZE);
       ERROR0:
         return err;
 }
@@ -1163,7 +1168,7 @@ static int w83627hf_detach_client(struct i2c_client *client)
         if ((err = i2c_detach_client(client)))
                 return err;
 
-        release_region(client->addr, WINB_EXTENT);
+        release_region(client->addr + WINB_REGION_OFFSET, WINB_REGION_SIZE);
         kfree(data);
 
         return 0;