diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-02 15:43:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-02 15:43:03 -0800 |
| commit | 6b3bf2049180c4d4d6f4432f9148621410c179a9 (patch) | |
| tree | 4f8d936d792ef3740d40189053155f7be331f7b0 /drivers/input/mouse/pxa930_trkball.c | |
| parent | 36b31106b725ac2ca4941d4ee8dbb67df72ed5dd (diff) | |
| parent | 9ab7b25e6a30d2292bd6d4913b71c918ee1e21b4 (diff) | |
| download | blackbird-op-linux-6b3bf2049180c4d4d6f4432f9148621410c179a9.tar.gz blackbird-op-linux-6b3bf2049180c4d4d6f4432f9148621410c179a9.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elantech - touchpad driver miss-recognising logitech mice
Input: synaptics - ensure we reset the device on resume
Input: usbtouchscreen - fix eGalax HID ignoring
Input: ambakmi - fix timeout handling in amba_kmi_write()
Input: pxa930_trkball - fix write timeout handling
Input: struct device - replace bus_id with dev_name(), dev_set_name()
Input: bf54x-keys - fix debounce time validation
Input: spitzkbd - mark probe function as __devinit
Input: omap-keypad - mark probe function as __devinit
Input: corgi_ts - mark probe function as __devinit
Input: corgikbd - mark probe function as __devinit
Input: uvc - the button on the camera is KEY_CAMERA
Input: psmouse - make MOUSE_PS2_LIFEBOOK depend on X86
Input: atkbd - make forced_release_keys[] static
Input: usbtouchscreen - allow reporting calibrated data
Diffstat (limited to 'drivers/input/mouse/pxa930_trkball.c')
| -rw-r--r-- | drivers/input/mouse/pxa930_trkball.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c index d297accf9a7f..1e827ad0afbe 100644 --- a/drivers/input/mouse/pxa930_trkball.c +++ b/drivers/input/mouse/pxa930_trkball.c @@ -83,7 +83,7 @@ static int write_tbcr(struct pxa930_trkball *trkball, int v) __raw_writel(v, trkball->mmio_base + TBCR); - while (i--) { + while (--i) { if (__raw_readl(trkball->mmio_base + TBCR) == v) break; msleep(1); |
