Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / drivers / input / rmi4 / rmi_f12.c

diff --git a/drivers/input/rmi4/rmi_f12.c b/drivers/input/rmi4/rmi_f12.c
index bb14369e34a78cf8a4d321384167fc58db9e6adf..d20a5d6780d1d40b209f40da0c9342493aef9ed3 100644 (file)
--- a/drivers/input/rmi4/rmi_f12.c
+++ b/drivers/input/rmi4/rmi_f12.c
@@ -70,7 +70,6 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12)
        int pitch_y = 0;
        int rx_receivers = 0;
        int tx_receivers = 0;
-       int sensor_flags = 0;
 
        item = rmi_get_register_desc_item(&f12->control_reg_desc, 8);
        if (!item) {
@@ -126,10 +125,9 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12)
                offset += 2;
        }
 
-       if (rmi_register_desc_has_subpacket(item, 4)) {
-               sensor_flags = buf[offset];
+       /* Skip over sensor flags */
+       if (rmi_register_desc_has_subpacket(item, 4))
                offset += 1;
-       }
 
        sensor->x_mm = (pitch_x * rx_receivers) >> 12;
        sensor->y_mm = (pitch_y * tx_receivers) >> 12;