mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
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.96f134dc19
wifi: mt76: handle possible mt76_rx_token_consume failuresfe13dad899
wifi: mt76: dma: do not increment queue head if mt76_dma_add_buf fails
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user