Merge tag 'v5.2' into next

[sfrench/cifs-2.6.git] / drivers / input / joystick / iforce / iforce-ff.c

diff --git a/drivers/input/joystick/iforce/iforce-ff.c b/drivers/input/joystick/iforce/iforce-ff.c
index 2ed7da7d1f3e1eeead2fc882b8ce6ff68ccbcf69..4cadebd8b9c46df56dc386a425b7755b5195edf2 100644 (file)
--- a/drivers/input/joystick/iforce/iforce-ff.c
+++ b/drivers/input/joystick/iforce/iforce-ff.c
@@ -372,12 +372,12 @@ int iforce_upload_periodic(struct iforce *iforce, struct ff_effect *effect, stru
        }
 
        switch (effect->u.periodic.waveform) {
-               case FF_SQUARE:         wave_code = 0x20; break;
-               case FF_TRIANGLE:       wave_code = 0x21; break;
-               case FF_SINE:           wave_code = 0x22; break;
-               case FF_SAW_UP:         wave_code = 0x23; break;
-               case FF_SAW_DOWN:       wave_code = 0x24; break;
-               default:                wave_code = 0x20; break;
+       case FF_SQUARE:         wave_code = 0x20; break;
+       case FF_TRIANGLE:       wave_code = 0x21; break;
+       case FF_SINE:           wave_code = 0x22; break;
+       case FF_SAW_UP:         wave_code = 0x23; break;
+       case FF_SAW_DOWN:       wave_code = 0x24; break;
+       default:                wave_code = 0x20; break;
        }
 
        if (!old || need_core(old, effect)) {
@@ -476,9 +476,9 @@ int iforce_upload_condition(struct iforce *iforce, struct ff_effect *effect, str
        int core_err = 0;
 
        switch (effect->type) {
-               case FF_SPRING: type = 0x40; break;
-               case FF_DAMPER: type = 0x41; break;
-               default: return -1;
+       case FF_SPRING: type = 0x40; break;
+       case FF_DAMPER: type = 0x41; break;
+       default: return -1;
        }
 
        if (!old || need_condition_modifier(iforce, old, effect)) {