[GIT PULL] IRQ fixes

[Ingo Molnar]

Linus,

Please pull the latest irq-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 
irq-urgent-for-linus

   # HEAD: 3424243e39e8ec138486926949e3668e7553125d irqchip/irq-mvebu-sei: Fix 
a NULL vs IS_ERR() bug in probe function

An irqchip driver fix and a memory (over-)allocation fix.

 Thanks,

        Ingo

------------------>
Dan Carpenter (1):
      irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function

Michael Kelley (1):
      irq/matrix: Fix memory overallocation


 drivers/irqchip/irq-mvebu-sei.c | 4 ++--
 kernel/irq/matrix.c             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/irqchip/irq-mvebu-sei.c b/drivers/irqchip/irq-mvebu-sei.c
index 566d69a2edbc..add4c9c934c8 100644
--- a/drivers/irqchip/irq-mvebu-sei.c
+++ b/drivers/irqchip/irq-mvebu-sei.c
@@ -384,9 +384,9 @@ static int mvebu_sei_probe(struct platform_device *pdev)
 
        sei->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        sei->base = devm_ioremap_resource(sei->dev, sei->res);
-       if (!sei->base) {
+       if (IS_ERR(sei->base)) {
                dev_err(sei->dev, "Failed to remap SEI resource\n");
-               return -ENODEV;
+               return PTR_ERR(sei->base);
        }
 
        /* Retrieve the SEI capabilities with the interrupt ranges */
diff --git a/kernel/irq/matrix.c b/kernel/irq/matrix.c
index 6e6d467f3dec..1f0985adf193 100644
--- a/kernel/irq/matrix.c
+++ b/kernel/irq/matrix.c
@@ -8,7 +8,7 @@
 #include <linux/cpu.h>
 #include <linux/irq.h>
 
-#define IRQ_MATRIX_SIZE        (BITS_TO_LONGS(IRQ_MATRIX_BITS) * 
sizeof(unsigned long))
+#define IRQ_MATRIX_SIZE        (BITS_TO_LONGS(IRQ_MATRIX_BITS))
 
 struct cpumap {
        unsigned int            available;