Merge branches 'release' and 'autoload' into release

[linux-2.6-omap-h63xx.git] / drivers / input / touchscreen / mk712.c

diff --git a/drivers/input/touchscreen/mk712.c b/drivers/input/touchscreen/mk712.c
index 4cbcaa6a71e5d0d72c157e4430feb5fff53ec588..80a65886870624300be79bfb008f4add780d68e4 100644 (file)
--- a/drivers/input/touchscreen/mk712.c
+++ b/drivers/input/touchscreen/mk712.c
@@ -96,15 +96,13 @@ static irqreturn_t mk712_interrupt(int irq, void *dev_id)
                goto end;
        }
 
-       if (~status & MK712_STATUS_TOUCH)
-       {
+       if (~status & MK712_STATUS_TOUCH) {
                debounce = 1;
                input_report_key(mk712_dev, BTN_TOUCH, 0);
                goto end;
        }
 
-       if (debounce)
-       {
+       if (debounce) {
                debounce = 0;
                goto end;
        }
@@ -113,8 +111,7 @@ static irqreturn_t mk712_interrupt(int irq, void *dev_id)
        input_report_abs(mk712_dev, ABS_X, last_x);
        input_report_abs(mk712_dev, ABS_Y, last_y);
 
-end:
-
+ end:
        last_x = inw(mk712_io + MK712_X) & 0x0fff;
        last_y = inw(mk712_io + MK712_Y) & 0x0fff;
        input_sync(mk712_dev);
@@ -169,13 +166,14 @@ static int __init mk712_init(void)
            (inw(mk712_io + MK712_STATUS) & 0xf333)) {
                printk(KERN_WARNING "mk712: device not present\n");
                err = -ENODEV;
-               goto fail;
+               goto fail1;
        }
 
-       if (!(mk712_dev = input_allocate_device())) {
+       mk712_dev = input_allocate_device();
+       if (!mk712_dev) {
                printk(KERN_ERR "mk712: not enough memory\n");
                err = -ENOMEM;
-               goto fail;
+               goto fail1;
        }
 
        mk712_dev->name = "ICS MicroClock MK712 TouchScreen";
@@ -188,21 +186,25 @@ static int __init mk712_init(void)
        mk712_dev->open    = mk712_open;
        mk712_dev->close   = mk712_close;
 
-       mk712_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-       mk712_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+       mk712_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+       mk712_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
        input_set_abs_params(mk712_dev, ABS_X, 0, 0xfff, 88, 0);
        input_set_abs_params(mk712_dev, ABS_Y, 0, 0xfff, 88, 0);
 
        if (request_irq(mk712_irq, mk712_interrupt, 0, "mk712", mk712_dev)) {
                printk(KERN_WARNING "mk712: unable to get IRQ\n");
                err = -EBUSY;
-               goto fail;
+               goto fail1;
        }
 
-       input_register_device(mk712_dev);
+       err = input_register_device(mk712_dev);
+       if (err)
+               goto fail2;
+
        return 0;
 
- fail: input_free_device(mk712_dev);
+ fail2:        free_irq(mk712_irq, mk712_dev);
+ fail1:        input_free_device(mk712_dev);
        release_region(mk712_io, 8);
        return err;
 }