HID: wacom: Report correct device resolution when using the wireless adapater

[karo-tx-linux.git] / drivers / hid / hid-lg.c

diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 3f01da695d5e11e527e95f858ba3e118f88dd3b1..429340d809b5546341d09fc6a3bea6fedb525497 100644 (file)
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -714,11 +714,11 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
        if (drv_data->quirks & LG_FF)
                ret = lgff_init(hdev);
-       if (drv_data->quirks & LG_FF2)
+       else if (drv_data->quirks & LG_FF2)
                ret = lg2ff_init(hdev);
-       if (drv_data->quirks & LG_FF3)
+       else if (drv_data->quirks & LG_FF3)
                ret = lg3ff_init(hdev);
-       if (drv_data->quirks & LG_FF4)
+       else if (drv_data->quirks & LG_FF4)
                ret = lg4ff_init(hdev);
 
        if (ret)
@@ -735,8 +735,8 @@ static void lg_remove(struct hid_device *hdev)
        struct lg_drv_data *drv_data = hid_get_drvdata(hdev);
        if (drv_data->quirks & LG_FF4)
                lg4ff_deinit(hdev);
-
-       hid_hw_stop(hdev);
+       else
+               hid_hw_stop(hdev);
        kfree(drv_data);
 }