diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-29 01:59:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 09:18:10 -0700 |
| commit | 08c67d2a5d1c97b7997dc9589f702d875c63de07 (patch) | |
| tree | b0b8f98c0d689dded45514ce801429e7264ad542 /drivers/mfd | |
| parent | aa83aa40ed2ae113d9ee5529cdd9e8c0e5fabe61 (diff) | |
| download | linux-3.10-08c67d2a5d1c97b7997dc9589f702d875c63de07.tar.gz linux-3.10-08c67d2a5d1c97b7997dc9589f702d875c63de07.tar.bz2 linux-3.10-08c67d2a5d1c97b7997dc9589f702d875c63de07.zip | |
[PATCH] ucb1x00-ts: handle errors from input_register_device()
ucb1x00-ts: handle errors from input_register_device()
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/ucb1x00-ts.c | 45 |
1 files changed, 28 insertions, 17 deletions
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index 02776814443..82938ad6ddb 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c @@ -58,6 +58,7 @@ static int adcsync; static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x, u16 y) { struct input_dev *idev = ts->idev; + input_report_abs(idev, ABS_X, x); input_report_abs(idev, ABS_Y, y); input_report_abs(idev, ABS_PRESSURE, pressure); @@ -67,6 +68,7 @@ static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts) { struct input_dev *idev = ts->idev; + input_report_abs(idev, ABS_PRESSURE, 0); input_sync(idev); } @@ -189,6 +191,7 @@ static inline unsigned int ucb1x00_ts_read_yres(struct ucb1x00_ts *ts) static inline int ucb1x00_ts_pen_down(struct ucb1x00_ts *ts) { unsigned int val = ucb1x00_reg_read(ts->ucb, UCB_TS_CR); + if (machine_is_collie()) return (!(val & (UCB_TS_CR_TSPX_LOW))); else @@ -291,6 +294,7 @@ static int ucb1x00_thread(void *_ts) static void ucb1x00_ts_irq(int idx, void *id) { struct ucb1x00_ts *ts = id; + ucb1x00_disable_irq(ts->ucb, UCB_IRQ_TSPX, UCB_FALLING); wake_up(&ts->irq_wait); } @@ -372,36 +376,43 @@ static int ucb1x00_ts_resume(struct ucb1x00_dev *dev) static int ucb1x00_ts_add(struct ucb1x00_dev *dev) { struct ucb1x00_ts *ts; + struct input_dev *idev; + int err; ts = kzalloc(sizeof(struct ucb1x00_ts), GFP_KERNEL); - if (!ts) - return -ENOMEM; - - ts->idev = input_allocate_device(); - if (!ts->idev) { - kfree(ts); - return -ENOMEM; + idev = input_allocate_device(); + if (!ts || !idev) { + err = -ENOMEM; + goto fail; } ts->ucb = dev->ucb; + ts->idev = idev; ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC; - ts->idev->private = ts; - ts->idev->name = "Touchscreen panel"; - ts->idev->id.product = ts->ucb->id; - ts->idev->open = ucb1x00_ts_open; - ts->idev->close = ucb1x00_ts_close; + idev->private = ts; + idev->name = "Touchscreen panel"; + idev->id.product = ts->ucb->id; + idev->open = ucb1x00_ts_open; + idev->close = ucb1x00_ts_close; - __set_bit(EV_ABS, ts->idev->evbit); - __set_bit(ABS_X, ts->idev->absbit); - __set_bit(ABS_Y, ts->idev->absbit); - __set_bit(ABS_PRESSURE, ts->idev->absbit); + __set_bit(EV_ABS, idev->evbit); + __set_bit(ABS_X, idev->absbit); + __set_bit(ABS_Y, idev->absbit); + __set_bit(ABS_PRESSURE, idev->absbit); - input_register_device(ts->idev); + err = input_register_device(idev); + if (err) + goto fail; dev->priv = ts; return 0; + + fail: + input_free_device(idev); + kfree(ts); + return err; } static void ucb1x00_ts_remove(struct ucb1x00_dev *dev) |