Hi
On Tue, Feb 18, 2014 at 11:22 PM, Frank Praznik <frank.praznik@xxxxxxxxx> wrote:
> Only initialize force feedback for devices that actually support it (Sixaxis and
> Dualshock 4).
>
> Move the cancel_work_sync() call out of sony_destroy_ff() since the state worker
> is used for the LEDs even when force-feedback is disabled.
>
> Remove the sony_destroy_ff() function since it is no longer used.
>
> Signed-off-by: Frank Praznik <frank.praznik@xxxxxxxxx>
> ---
> drivers/hid/hid-sony.c | 21 +++++++--------------
> 1 file changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
> index 81917eb..ad1cebd 100644
> --- a/drivers/hid/hid-sony.c
> +++ b/drivers/hid/hid-sony.c
> @@ -50,6 +50,7 @@
> #define SONY_LED_SUPPORT (SIXAXIS_CONTROLLER | BUZZ_CONTROLLER |\
> DUALSHOCK4_CONTROLLER)
> #define SONY_BATTERY_SUPPORT (SIXAXIS_CONTROLLER | DUALSHOCK4_CONTROLLER)
> +#define SONY_FF_SUPPORT (SIXAXIS_CONTROLLER | DUALSHOCK4_CONTROLLER)
>
> #define MAX_LEDS 4
>
> @@ -1354,22 +1355,12 @@ static int sony_init_ff(struct hid_device *hdev)
> return input_ff_create_memless(input_dev, NULL, sony_play_effect);
> }
>
> -static void sony_destroy_ff(struct hid_device *hdev)
> -{
> - struct sony_sc *sc = hid_get_drvdata(hdev);
> -
> - cancel_work_sync(&sc->state_worker);
> -}
> -
> #else
> static int sony_init_ff(struct hid_device *hdev)
> {
> return 0;
> }
>
> -static void sony_destroy_ff(struct hid_device *hdev)
> -{
> -}
> #endif
>
> static int sony_battery_get_property(struct power_supply *psy,
> @@ -1567,9 +1558,11 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
> }
> }
>
> - ret = sony_init_ff(hdev);
> - if (ret < 0)
> - goto err_close;
> + if (sc->quirks & SONY_FF_SUPPORT) {
> + ret = sony_init_ff(hdev);
> + if (ret < 0)
> + goto err_close;
> + }
>
> return 0;
> err_close:
> @@ -1595,7 +1588,7 @@ static void sony_remove(struct hid_device *hdev)
> sony_battery_remove(sc);
> }
>
> - sony_destroy_ff(hdev);
> + cancel_work_sync(&sc->state_worker);
Ugh, that's a bugfix! This can trigger if the led-worker runs during
unplug. You should mark it for stable next time you send it (adding:
Cc: <stable@xxxxxxxxxxxxxxx>)
Reviewed-by: David Herrmann <dh.herrmann@xxxxxxxxx>
Thanks
David
>
> hid_hw_stop(hdev);
> }
> --
> 1.8.5.3
>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
