← Back to branch summary

~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to drivers/input/joystick/walkera0701.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-25.38
  • Date: 2013-02-20 22:03:31 UTC
  • mfrom: (74.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130220220331-0ea4l33x3cr61nch
Tags: 3.5.0-220.28
https://launchpad.net/bugs/1130311
https://launchpad.net/bugs/1129472
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
* Release Tracking Bug
  - LP: #1130311

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-25.38

[ Ubuntu: 3.5.0-25.38 ]

* Release Tracking Bug
  - LP: #1129472
* ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()
  - LP: #1119885, #1129192
  - CVE-2013-0871
* ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL
  - LP: #1119885, #1129192
  - CVE-2013-0871
* wake_up_process() should be never used to wakeup a TASK_STOPPED/TRACED
  task
  - LP: #1119885, #1129192
  - CVE-2013-0871

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/input/joystick/walkera0701.c
196
196
        struct walkera_dev *w = input_get_drvdata(dev);
197
197
 
198
198
        parport_disable_irq(w->parport);
 
199
        hrtimer_cancel(&w->timer);
199
200
}
200
201
 
201
202
static int walkera0701_connect(struct walkera_dev *w, int parport)
224
225
        if (parport_claim(w->pardevice))
225
226
                goto init_err1;
226
227
 
 
228
        hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 
229
        w->timer.function = timer_handler;
 
230
 
227
231
        w->input_dev = input_allocate_device();
228
232
        if (!w->input_dev)
229
233
                goto init_err2;
254
258
        if (err)
255
259
                goto init_err3;
256
260
 
257
 
        hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
258
 
        w->timer.function = timer_handler;
259
261
        return 0;
260
262
 
261
263
 init_err3:
271
273
 
272
274
static void walkera0701_disconnect(struct walkera_dev *w)
273
275
{
274
 
        hrtimer_cancel(&w->timer);
275
276
        input_unregister_device(w->input_dev);
276
277
        parport_release(w->pardevice);
277
278
        parport_unregister_device(w->pardevice);