← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-ports/karmic

« back to all changes in this revision

Viewing changes to drivers/input/keyboard/bf54x-keys.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Luke Yelavich, Michael Casadevall, Tim Gardner, Upstream Kernel Changes
  • Date: 2009-05-06 18:18:55 UTC
  • Revision ID: james.westby@ubuntu.com-20090506181855-t00baeevpnvd9o7a
Tags: 2.6.30-1.1
[ Luke Yelavich ]
* initial release for karmic
* SAUCE: rebase-ports - adjust for the karmic ports kernel
* SAUCE: rebase-ports - also remove abi dirs/files on rebase
* Update configs after rebase against mainline Jaunty tree
* [Config] Disable CONFIG_BLK_DEV_UB and CONFIG_USB_LIBUSUAL as per
  mainline jaunty
* forward-port patch to drbd for powerpc compilation
* [Config] disable CONFIG_LENOVO_SL_LAPTOP for i386 due to FTBFS
* add .o files found in arch/powerpc/lib to all powerpc kernel header
  packages
* [Config] enable CONFIG_DRM_I915_KMS for i386 as per karmic mainline

[ Michael Casadevall ]

* Disable kgdb on sparc64
* [sparc] [Config] Disable GPIO LEDS
* [ia64] Rename -ia64-generic to -ia64 in line with other architectures
* Correct kernel image path for sparc builds
* [hppa] Fix HPPA config files to build modules for all udebian

Rebase on top of karmic mainline 2.6.30-1.1

[ Tim Gardner ]

* [Config] armel: disable staging drivers, fixes FTBS
* [Config] armel imx51: Disable CONFIG_MTD_NAND_MXC, fixes FTBS

[ Upstream Kernel Changes ]

* mpt2sas: Change reset_type enum to avoid namespace collision.
  Submitted upstream.

* Initial release after rebasing against v2.6.30-rc3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/input/keyboard/bf54x-keys.c
209
209
                goto out;
210
210
        }
211
211
 
212
 
        if (!pdata->debounce_time || !pdata->debounce_time > MAX_MULT ||
213
 
            !pdata->coldrive_time || !pdata->coldrive_time > MAX_MULT) {
214
 
                printk(KERN_ERR DRV_NAME
215
 
                        ": Invalid Debounce/Columdrive Time from pdata\n");
 
212
        if (!pdata->debounce_time || pdata->debounce_time > MAX_MULT ||
 
213
            !pdata->coldrive_time || pdata->coldrive_time > MAX_MULT) {
 
214
                printk(KERN_WARNING DRV_NAME
 
215
                        ": Invalid Debounce/Columndrive Time in platform data\n");
216
216
                bfin_write_KPAD_MSEL(0xFF0);    /* Default MSEL */
217
217
        } else {
218
218
                bfin_write_KPAD_MSEL(
252
252
        }
253
253
 
254
254
        error = request_irq(bf54x_kpad->irq, bfin_kpad_isr,
255
 
                                 IRQF_SAMPLE_RANDOM, DRV_NAME, pdev);
 
255
                                0, DRV_NAME, pdev);
256
256
        if (error) {
257
257
                printk(KERN_ERR DRV_NAME
258
258
                        ": unable to claim irq %d; error %d\n",