| Message ID | 20221213044935.1775499-2-roderick.colenbrander@sony.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 0ee29814c6be17a924761d3712eb8ad63cfe13ac |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | HID: playstation: DS4 fixes | expand |
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index f9d66a00951b..a1e4322a73f5 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -904,7 +904,7 @@ config HID_PLAYSTATION select CRC32 select POWER_SUPPLY help - Provides support for Sony PS5 controllers including support for + Provides support for Sony PS4/PS5 controllers including support for its special functionalities e.g. touchpad, lights and motion sensors. diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c index 7b5aef538044..f399bf0d3c8c 100644 --- a/drivers/hid/hid-playstation.c +++ b/drivers/hid/hid-playstation.c @@ -1916,7 +1916,7 @@ static int dualshock4_get_mac_address(struct dualshock4 *ds4) if (ret != sizeof(ds4->base.mac_address)) return -EINVAL; - ret = 0; + return 0; } err_free:
The 'buf' variable is only used in the USB (if-path) and not in the Bluetooth else-path. Since it is not set to NULL. this results in freeing an uninitialized pointer. Since the else code-path doesn't need buf, just return 0. Fixes: 2d77474a2392 ("HID: playstation: add DualShock4 bluetooth support.") Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com> --- drivers/hid/Kconfig | 2 +- drivers/hid/hid-playstation.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)