Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nzxt-smart2: apply patches from upstream #70

Merged
merged 5 commits into from
May 12, 2024
Merged

nzxt-smart2: apply patches from upstream #70

merged 5 commits into from
May 12, 2024

Commits on May 11, 2024

  1. hwmon: (nzxt-smart2) make array detect_fans_report static const 

    Don't populate the read-only array detect_fans_report on the stack but
instead it static const. Also makes the object code a little smaller.

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Link: https://lore.kernel.org/r/20220109194558.45811-1-colin.i.king@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    @ColinIanKing @amezin
    ColinIanKing authored and amezin committed May 11, 2024
    Configuration menu
    Copy the full SHA
    b0088a8 View commit details
    Browse the repository at this point in the history

  2. hwmon: (nzxt-smart2) handle failure of devm_add_action in nzxt_smart2… 

    …_hid_probe

1. replace the devm_add_action with devm_add_action_or_reset to ensure
the mutex lock can be destroyed when it fails.
2. use local wrapper function mutex_fini instead of mutex_destroy to
avoid undefined behaviours.
3. add a check of devm_add_action_or_reset and return early when it fails.

Link: https://lore.kernel.org/all/f5043281-9b3e-e454-16fe-ef4cde36dfdb@roeck-us.net
Signed-off-by: Kang Chen <void0red@gmail.com>
Link: https://lore.kernel.org/r/20230227091534.907101-1-void0red@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    @void0red @amezin
    void0red authored and amezin committed May 11, 2024
    Configuration menu
    Copy the full SHA
    ccd8b52 View commit details
    Browse the repository at this point in the history

  3. hwmon: (nzxt-smart2) Add device id 

    Adding support for new device id
1e71:2019 NZXT NZXT RGB & Fan Controller

Signed-off-by: Herman Fries <baracoder@googlemail.com>
Link: https://lore.kernel.org/r/20221214194627.135692-1-baracoder@googlemail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    @baracoder @amezin
    baracoder authored and amezin committed May 11, 2024
    Configuration menu
    Copy the full SHA
    55a11cd View commit details
    Browse the repository at this point in the history

  4. hwmon: (nzxt-smart2) add another USB ID 

    This seems to be a new revision of the device. RGB controls have changed,
but this driver doesn't touch them anyway.

Fan speed control reported to be working with existing userspace (hidraw)
software, so I assume it's compatible. Fan channel count is the same.

Recently added (0x1e71, 0x2019) seems to be the same device.

Discovered in liquidctl project:

liquidctl/liquidctl#541

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
Link: https://lore.kernel.org/r/20230219105924.333007-1-mezin.alexander@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    @amezin
    amezin committed May 11, 2024
    Configuration menu
    Copy the full SHA
    138da75 View commit details
    Browse the repository at this point in the history

  5. Vagrantfile: add new USB ids (nzxt-smart2) 

    Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
    @amezin
    amezin committed May 11, 2024
    Configuration menu
    Copy the full SHA
    9602269 View commit details
    Browse the repository at this point in the history