← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/pci/hotplug/pciehp_ctrl.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-26.42
  • Date: 2013-03-14 15:21:40 UTC
  • mfrom: (76.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130314152140-tl4mkjmxa038tm3h
Tags: 3.5.0-221.31
https://launchpad.net/bugs/1153648
https://launchpad.net/bugs/1152715
https://launchpad.net/bugs/1122094
https://launchpad.net/bugs/1147678
* Release Tracking Bug
  - LP: #1153648

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-26.42

[ Ubuntu: 3.5.0-26.42 ]

* Release Tracking Bug
  - LP: #1152715
* ubuntu: overlayfs -- fix missmerge of vfs_open changes
  - LP: #1122094, #1147678

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/pci/hotplug/pciehp_ctrl.c
49
49
        info->p_slot = p_slot;
50
50
        INIT_WORK(&info->work, interrupt_event_handler);
51
51
 
52
 
        queue_work(pciehp_wq, &info->work);
 
52
        queue_work(p_slot->wq, &info->work);
53
53
 
54
54
        return 0;
55
55
}
344
344
                kfree(info);
345
345
                goto out;
346
346
        }
347
 
        queue_work(pciehp_wq, &info->work);
 
347
        queue_work(p_slot->wq, &info->work);
348
348
 out:
349
349
        mutex_unlock(&p_slot->lock);
350
350
}
377
377
                if (ATTN_LED(ctrl))
378
378
                        pciehp_set_attention_status(p_slot, 0);
379
379
 
380
 
                queue_delayed_work(pciehp_wq, &p_slot->work, 5*HZ);
 
380
                queue_delayed_work(p_slot->wq, &p_slot->work, 5*HZ);
381
381
                break;
382
382
        case BLINKINGOFF_STATE:
383
383
        case BLINKINGON_STATE:
439
439
        else
440
440
                p_slot->state = POWERON_STATE;
441
441
 
442
 
        queue_work(pciehp_wq, &info->work);
 
442
        queue_work(p_slot->wq, &info->work);
443
443
}
444
444
 
445
445
static void interrupt_event_handler(struct work_struct *work)