Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

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

diff --git a/drivers/hwmon/ftsteutates.c b/drivers/hwmon/ftsteutates.c
index 2b2ff67026be999abbf5577ee9f946d755656275..48633e541dc352396facc2cdff0caf57f24e899a 100644 (file)
--- a/drivers/hwmon/ftsteutates.c
+++ b/drivers/hwmon/ftsteutates.c
@@ -242,7 +242,7 @@ static int fts_wd_set_resolution(struct fts_data *data,
        }
 
        if (resolution == seconds)
-               set_bit(1, (unsigned long *)&ret);
+               ret |= BIT(1);
        else
                ret &= ~BIT(1);