diff options
| author | Kalle Valo <kvalo@kernel.org> | 2023-01-17 12:36:25 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2023-01-17 12:36:25 +0100 |
| commit | d0e99511834b6828c960e978d9a8cb6e5731250d (patch) | |
| tree | e7b062c1f9d28a55083477a1462286a7923a57fd /net/rfkill | |
| parent | wifi: rtl8xxxu: Dump the efuse only for untested devices (diff) | |
| parent | Revert "wifi: mac80211: fix memory leak in ieee80211_if_add()" (diff) | |
| download | linux-d0e99511834b6828c960e978d9a8cb6e5731250d.tar.xz linux-d0e99511834b6828c960e978d9a8cb6e5731250d.zip | |
Merge wireless into wireless-next
Due to the two cherry picked commits from wireless to wireless-next we have
several conflicts in mt76. To avoid any bugs with conflicts merge wireless into
wireless-next.
96f134dc1964 wifi: mt76: handle possible mt76_rx_token_consume failures
fe13dad8992b wifi: mt76: dma: do not increment queue head if mt76_dma_add_buf fails
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index dac4fdc7488a..b390ff245d5e 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -832,7 +832,7 @@ static void rfkill_release(struct device *dev) kfree(rfkill); } -static int rfkill_dev_uevent(struct device *dev, struct kobj_uevent_env *env) +static int rfkill_dev_uevent(const struct device *dev, struct kobj_uevent_env *env) { struct rfkill *rfkill = to_rfkill(dev); unsigned long flags; |