Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236539
b: refs/heads/master
c: 480ae58
h: refs/heads/master
i:
  236537: b5effe6
  236535: 233cc7c
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Mar 14, 2011
1 parent 3534a32 commit d49ce7b
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 6de3d6aa9ad455726eb7b689e2d3e57d89374e55
refs/heads/master: 480ae58db525e57cc18611eec7ae24633d2e7efc
5 changes: 2 additions & 3 deletions trunk/drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ static void vmbus_on_msg_dpc(unsigned long data)
/*
* vmbus_on_isr - ISR routine
*/
static int vmbus_on_isr(struct hv_driver *drv)
static int vmbus_on_isr(void)
{
int ret = 0;
int cpu = smp_processor_id();
Expand Down Expand Up @@ -989,8 +989,7 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
{
int ret;

/* Call to bus driver to handle interrupt */
ret = vmbus_on_isr(NULL);
ret = vmbus_on_isr();

/* Schedules a dpc if necessary */
if (ret > 0) {
Expand Down

0 comments on commit d49ce7b

Please sign in to comment.