diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-07 17:50:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-07 17:50:51 +1000 |
| commit | eec1ba76a0f043bdea21db10df4287bb5a4d25a8 (patch) | |
| tree | 269e10ce578105322820dd426e30cf9eea7513c6 /drivers/staging/dst/export.c | |
| parent | 9fdbbf93bb3bb2b62335e780bb94871fc39dc5d8 (diff) | |
| parent | bb104a76ac0e6c103c36623616c7dee8cd9d165c (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/dst/export.c')
| -rw-r--r-- | drivers/staging/dst/export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/dst/export.c b/drivers/staging/dst/export.c index 80ae4ebe610a..4fbd848bd14f 100644 --- a/drivers/staging/dst/export.c +++ b/drivers/staging/dst/export.c @@ -159,7 +159,7 @@ static struct dst_state *dst_accept_client(struct dst_state *st) goto err_out_exit; new = dst_state_alloc(st->node); - if (!new) { + if (IS_ERR(new)) { err = -ENOMEM; goto err_out_release; } |