From ffc03d0b84d1f6541be0a1d0b0484600947919ff Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 16 Nov 2011 01:54:04 -0300 Subject: [PATCH] --- yaml --- r: 285251 b: refs/heads/master c: affc9a0d59ac49bd304e2137bd5e4ffdd6fdfa52 h: refs/heads/master i: 285249: 9e308959c3ef3121bf442e5dfa71bf23e38cb927 285247: ddeca82d2e9a9ec1f859e4e275e2cb11549be364 v: v3 --- [refs] | 2 +- .../drivers/staging/media/lirc/lirc_serial.c | 21 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 9c5560db572c..d6b09227c5a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b98d60679711753e548be15c6bef5239db6ed64 +refs/heads/master: affc9a0d59ac49bd304e2137bd5e4ffdd6fdfa52 diff --git a/trunk/drivers/staging/media/lirc/lirc_serial.c b/trunk/drivers/staging/media/lirc/lirc_serial.c index 6f5257e68724..0ca308a1183c 100644 --- a/trunk/drivers/staging/media/lirc/lirc_serial.c +++ b/trunk/drivers/staging/media/lirc/lirc_serial.c @@ -843,18 +843,15 @@ static int __devinit lirc_serial_probe(struct platform_device *dev) result = request_irq(irq, irq_handler, (share_irq ? IRQF_SHARED : 0), LIRC_DRIVER_NAME, (void *)&hardware); - - switch (result) { - case -EBUSY: - printk(KERN_ERR LIRC_DRIVER_NAME ": IRQ %d busy\n", irq); - return -EBUSY; - case -EINVAL: - printk(KERN_ERR LIRC_DRIVER_NAME - ": Bad irq number or handler\n"); - return -EINVAL; - default: - break; - }; + if (result < 0) { + if (result == -EBUSY) + printk(KERN_ERR LIRC_DRIVER_NAME ": IRQ %d busy\n", + irq); + else if (result == -EINVAL) + printk(KERN_ERR LIRC_DRIVER_NAME + ": Bad irq number or handler\n"); + return result; + } /* Reserve io region. */ /*