Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2cede49 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wlcore: always register dummy hardirq 



This keeps the kernel happy when using edge-irqs and requesting a
threaded irq.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
parent 1f8a1890

drivers/net/wireless/ti/wlcore/main.c

+11 −3
Original line number Diff line number Diff line
@@ -5994,6 +5994,11 @@ static const struct wiphy_wowlan_support wlcore_wowlan_support = { 
};

#endif



static irqreturn_t wlcore_hardirq(int irq, void *cookie)

{

	return IRQ_WAKE_THREAD;

}



static void wlcore_nvs_cb(const struct firmware *fw, void *context)

{

	struct wl1271 *wl = context;
@@ -6002,6 +6007,7 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context) 
	struct wl12xx_platform_data *pdata = pdev_data->pdata;

	unsigned long irqflags;

	int ret;

	irq_handler_t hardirq_fn = NULL;



	if (fw) {

		wl->nvs = kmemdup(fw->data, fw->size, GFP_KERNEL);
@@ -6030,12 +6036,14 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context) 
	wl->platform_quirks = pdata->platform_quirks;

	wl->if_ops = pdev_data->if_ops;



	if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)

	if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ) {

		irqflags = IRQF_TRIGGER_RISING;

	else

		hardirq_fn = wlcore_hardirq;

	} else {

		irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;

	}



	ret = request_threaded_irq(wl->irq, NULL, wlcore_irq,

	ret = request_threaded_irq(wl->irq, hardirq_fn, wlcore_irq,

				   irqflags, pdev->name, wl);

	if (ret < 0) {

		wl1271_error("request_irq() failed: %d", ret);