From 3d8844380f379da8f2e23a1d06fad196b5e295f6 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Fri, 29 Apr 2011 13:45:07 -0700 Subject: [PATCH] --- yaml --- r: 249354 b: refs/heads/master c: 66d9229c2a0823e73002c71bed28c2000c4c5670 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/vmbus_drv.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 60e798163be1..85bed50fd27e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59c0e4f0a665396bb5301f82764ebda8e3153783 +refs/heads/master: 66d9229c2a0823e73002c71bed28c2000c4c5670 diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c index 38bfff044dfb..6cc01c2dc285 100644 --- a/trunk/drivers/staging/hv/vmbus_drv.c +++ b/trunk/drivers/staging/hv/vmbus_drv.c @@ -43,11 +43,11 @@ static struct pci_dev *hv_pci_dev; static struct tasklet_struct msg_dpc; +static struct tasklet_struct event_dpc; /* Main vmbus driver data structure */ struct hv_bus { struct bus_type bus; - struct tasklet_struct event_dpc; }; unsigned int vmbus_loglevel = (ALL_MODULES << 16 | INFO_LVL); @@ -519,7 +519,7 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id) tasklet_schedule(&msg_dpc); if (test_bit(1, (unsigned long *)&ret)) - tasklet_schedule(&hv_bus.event_dpc); + tasklet_schedule(&event_dpc); return IRQ_HANDLED; } else { @@ -552,7 +552,7 @@ static int vmbus_bus_init(struct pci_dev *pdev) /* Initialize the bus context */ tasklet_init(&msg_dpc, vmbus_on_msg_dpc, 0); - tasklet_init(&hv_bus.event_dpc, vmbus_on_event, 0); + tasklet_init(&event_dpc, vmbus_on_event, 0); /* Now, register the bus with LDM */ ret = bus_register(&hv_bus.bus);