← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/input/touchscreen/tps6507x-ts.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/input/touchscreen/tps6507x-ts.c
43
43
        struct input_dev        *input_dev;
44
44
        struct device           *dev;
45
45
        char                    phys[32];
46
 
        struct workqueue_struct *wq;
47
46
        struct delayed_work     work;
48
47
        unsigned                polling;        /* polling is active */
49
48
        struct ts_event         tc;
220
219
        poll = 1;
221
220
 
222
221
        if (poll) {
223
 
                schd = queue_delayed_work(tsc->wq, &tsc->work,
224
 
                                          msecs_to_jiffies(tsc->poll_period));
 
222
                schd = schedule_delayed_work(&tsc->work,
 
223
                                        msecs_to_jiffies(tsc->poll_period));
225
224
                if (schd)
226
225
                        tsc->polling = 1;
227
226
                else {
303
302
        tsc->input_dev = input_dev;
304
303
 
305
304
        INIT_DELAYED_WORK(&tsc->work, tps6507x_ts_handler);
306
 
        tsc->wq = create_workqueue("TPS6507x Touchscreen");
307
305
 
308
306
        if (init_data) {
309
307
                tsc->poll_period = init_data->poll_period;
325
323
        if (error)
326
324
                goto err2;
327
325
 
328
 
        schd = queue_delayed_work(tsc->wq, &tsc->work,
329
 
                                  msecs_to_jiffies(tsc->poll_period));
 
326
        schd = schedule_delayed_work(&tsc->work,
 
327
                                     msecs_to_jiffies(tsc->poll_period));
330
328
 
331
329
        if (schd)
332
330
                tsc->polling = 1;
341
339
 
342
340
err2:
343
341
        cancel_delayed_work_sync(&tsc->work);
344
 
        destroy_workqueue(tsc->wq);
345
342
        input_free_device(input_dev);
346
343
err1:
347
344
        kfree(tsc);
357
354
        struct input_dev *input_dev = tsc->input_dev;
358
355
 
359
356
        cancel_delayed_work_sync(&tsc->work);
360
 
        destroy_workqueue(tsc->wq);
361
357
 
362
358
        input_unregister_device(input_dev);
363
359