~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to drivers/net/wimax/i2400m/usb.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
* 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:
510
510
        switch (id->idProduct) {
511
511
        case USB_DEVICE_ID_I6050:
512
512
        case USB_DEVICE_ID_I6050_2:
 
513
        case USB_DEVICE_ID_I6150:
 
514
        case USB_DEVICE_ID_I6150_2:
 
515
        case USB_DEVICE_ID_I6150_3:
513
516
        case USB_DEVICE_ID_I6250:
514
517
                i2400mu->i6050 = 1;
515
518
                break;
759
762
struct usb_device_id i2400mu_id_table[] = {
760
763
        { USB_DEVICE(0x8086, USB_DEVICE_ID_I6050) },
761
764
        { USB_DEVICE(0x8086, USB_DEVICE_ID_I6050_2) },
 
765
        { USB_DEVICE(0x8087, USB_DEVICE_ID_I6150) },
 
766
        { USB_DEVICE(0x8087, USB_DEVICE_ID_I6150_2) },
 
767
        { USB_DEVICE(0x8087, USB_DEVICE_ID_I6150_3) },
762
768
        { USB_DEVICE(0x8086, USB_DEVICE_ID_I6250) },
763
769
        { USB_DEVICE(0x8086, 0x0181) },
764
770
        { USB_DEVICE(0x8086, 0x1403) },