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

Commit 0a1aaa03 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mfd: wcd9xxx-irq: check if wcd9xxx_res irq is 0 before using it"

parents 7f39ce6d 37512bc7

drivers/mfd/wcd9xxx-irq.c

+8 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -388,17 +388,20 @@ void wcd9xxx_free_irq(struct wcd9xxx_core_resource *wcd9xxx_res, 


void wcd9xxx_enable_irq(struct wcd9xxx_core_resource *wcd9xxx_res, int irq)

{

	if (wcd9xxx_res->irq)

		enable_irq(phyirq_to_virq(wcd9xxx_res, irq));

}



void wcd9xxx_disable_irq(struct wcd9xxx_core_resource *wcd9xxx_res, int irq)

{

	if (wcd9xxx_res->irq)

		disable_irq_nosync(phyirq_to_virq(wcd9xxx_res, irq));

}



void wcd9xxx_disable_irq_sync(

			struct wcd9xxx_core_resource *wcd9xxx_res, int irq)

{

	if (wcd9xxx_res->irq)

		disable_irq(phyirq_to_virq(wcd9xxx_res, irq));

}
@@ -559,6 +562,7 @@ void wcd9xxx_irq_exit(struct wcd9xxx_core_resource *wcd9xxx_res) 
		disable_irq_wake(wcd9xxx_res->irq);

		free_irq(wcd9xxx_res->irq, wcd9xxx_res);

		/* Release parent's of node */

		wcd9xxx_res->irq = 0;

		wcd9xxx_irq_put_upstream_irq(wcd9xxx_res);

	}

	mutex_destroy(&wcd9xxx_res->irq_lock);