Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249353
b: refs/heads/master
c: 59c0e4f
h: refs/heads/master
i:
  249351: 9c23883
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 3, 2011
1 parent 11f9ce7 commit ef01a69
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ef58f5d13537da06a131c1a2505a81fdd7d4a059
refs/heads/master: 59c0e4f0a665396bb5301f82764ebda8e3153783
7 changes: 4 additions & 3 deletions trunk/drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@

static struct pci_dev *hv_pci_dev;

static struct tasklet_struct msg_dpc;

/* Main vmbus driver data structure */
struct hv_bus {
struct bus_type bus;
struct tasklet_struct msg_dpc;
struct tasklet_struct event_dpc;
};

Expand Down Expand Up @@ -515,7 +516,7 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
/* Schedules a dpc if necessary */
if (ret > 0) {
if (test_bit(0, (unsigned long *)&ret))
tasklet_schedule(&hv_bus.msg_dpc);
tasklet_schedule(&msg_dpc);

if (test_bit(1, (unsigned long *)&ret))
tasklet_schedule(&hv_bus.event_dpc);
Expand Down Expand Up @@ -550,7 +551,7 @@ static int vmbus_bus_init(struct pci_dev *pdev)
hv_bus.bus.name = driver_name;

/* Initialize the bus context */
tasklet_init(&hv_bus.msg_dpc, vmbus_on_msg_dpc, 0);
tasklet_init(&msg_dpc, vmbus_on_msg_dpc, 0);
tasklet_init(&hv_bus.event_dpc, vmbus_on_event, 0);

/* Now, register the bus with LDM */
Expand Down

0 comments on commit ef01a69

Please sign in to comment.