Skip to content

Commit

Permalink
staging: hv: remove ASSERT()s in RndisFilter.c
Browse files Browse the repository at this point in the history
return -EINVAL instead of calling ASSERT() for these conditionals.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 45e4431 commit 8a62d71
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions drivers/staging/hv/RndisFilter.c
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,9 @@ static int RndisFilterOnReceive(struct hv_device *Device,

DPRINT_ENTER(NETVSC);

ASSERT(netDevice);
if (!netDevice)
return -EINVAL;

/* Make sure the rndis device state is initialized */
if (!netDevice->Extension) {
DPRINT_ERR(NETVSC, "got rndis message but no rndis device..."
Expand Down Expand Up @@ -492,7 +494,8 @@ static int RndisFilterQueryDevice(struct rndis_device *Device, u32 Oid,

DPRINT_ENTER(NETVSC);

ASSERT(Result);
if (!Result)
return -EINVAL;

*ResultSize = 0;
request = GetRndisRequest(Device, REMOTE_NDIS_QUERY_MSG,
Expand Down Expand Up @@ -885,7 +888,9 @@ int RndisFilterOnOpen(struct hv_device *Device)

DPRINT_ENTER(NETVSC);

ASSERT(netDevice);
if (!netDevice)
return -EINVAL;

ret = RndisFilterOpenDevice(netDevice->Extension);

DPRINT_EXIT(NETVSC);
Expand All @@ -900,7 +905,9 @@ int RndisFilterOnClose(struct hv_device *Device)

DPRINT_ENTER(NETVSC);

ASSERT(netDevice);
if (!netDevice)
return -EINVAL;

ret = RndisFilterCloseDevice(netDevice->Extension);

DPRINT_EXIT(NETVSC);
Expand Down

0 comments on commit 8a62d71

Please sign in to comment.