From 8a0aa7f29072d79b8c0857eadf6469184285b8e2 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 25 Aug 2011 09:49:19 -0700 Subject: [PATCH] --- yaml --- r: 267965 b: refs/heads/master c: 58ef3977ce8e0edba374dd7645e59cf5afdc6447 h: refs/heads/master i: 267963: cbcf0bea08f2abd51ee5a5aa0e1e77ddae2673f3 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/rndis_filter.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e8c9d2a46c3f..84ea1b450a8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de6e0580d5884942f58a636902e5b0225f38b8cf +refs/heads/master: 58ef3977ce8e0edba374dd7645e59cf5afdc6447 diff --git a/trunk/drivers/staging/hv/rndis_filter.c b/trunk/drivers/staging/hv/rndis_filter.c index f26886d7738b..f5f3052e32bf 100644 --- a/trunk/drivers/staging/hv/rndis_filter.c +++ b/trunk/drivers/staging/hv/rndis_filter.c @@ -511,7 +511,7 @@ static int rndis_filter_set_packet_filter(struct rndis_device *dev, RNDIS_MESSAGE_SIZE(struct rndis_set_request) + sizeof(u32)); if (!request) { - ret = -1; + ret = -ENOMEM; goto Cleanup; } @@ -531,7 +531,6 @@ static int rndis_filter_set_packet_filter(struct rndis_device *dev, t = wait_for_completion_timeout(&request->wait_event, 5*HZ); if (t == 0) { - ret = -1; dev_err(&dev->net_dev->dev->device, "timeout before we got a set response...\n"); /* @@ -540,8 +539,6 @@ static int rndis_filter_set_packet_filter(struct rndis_device *dev, */ goto Exit; } else { - if (ret > 0) - ret = 0; set_complete = &request->response_msg.msg.set_complete; status = set_complete->status; }