Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325409
b: refs/heads/master
c: 3d9562a
h: refs/heads/master
i:
  325407: 4808c63
v: v3
  • Loading branch information
Fengguang Wu authored and Greg Kroah-Hartman committed Sep 19, 2012
1 parent 7b9e5fa commit b5f120a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 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: 65bf58cef10bfdb180a621f33ad692d10756b2ee
refs/heads/master: 3d9562a6ed5389cd92deafa3e357e197b1ff136d
14 changes: 7 additions & 7 deletions trunk/drivers/staging/ozwpan/ozcdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ ssize_t oz_cdev_read(struct file *filp, char __user *buf, size_t count,
if (pd)
oz_pd_get(pd);
spin_unlock_bh(&g_cdev.lock);
if (pd == 0)
if (pd == NULL)
return -1;
ctx = oz_cdev_claim_ctx(pd);
if (ctx == 0)
if (ctx == NULL)
goto out2;
n = ctx->rd_in - ctx->rd_out;
if (n < 0)
Expand Down Expand Up @@ -157,11 +157,11 @@ ssize_t oz_cdev_write(struct file *filp, const char __user *buf, size_t count,
if (pd)
oz_pd_get(pd);
spin_unlock_bh(&g_cdev.lock);
if (pd == 0)
if (pd == NULL)
return -1;
eb = &pd->elt_buff;
ei = oz_elt_info_alloc(eb);
if (ei == 0) {
if (ei == NULL) {
count = 0;
goto out;
}
Expand Down Expand Up @@ -410,7 +410,7 @@ int oz_cdev_start(struct oz_pd *pd, int resume)
return 0;
}
ctx = kzalloc(sizeof(struct oz_serial_ctx), GFP_ATOMIC);
if (ctx == 0)
if (ctx == NULL)
return -ENOMEM;
atomic_set(&ctx->ref_count, 1);
ctx->tx_seq_num = 1;
Expand All @@ -424,7 +424,7 @@ int oz_cdev_start(struct oz_pd *pd, int resume)
spin_unlock_bh(&pd->app_lock[OZ_APPID_SERIAL-1]);
}
spin_lock(&g_cdev.lock);
if ((g_cdev.active_pd == 0) &&
if ((g_cdev.active_pd == NULL) &&
(memcmp(pd->mac_addr, g_cdev.active_addr, ETH_ALEN) == 0)) {
oz_pd_get(pd);
g_cdev.active_pd = pd;
Expand Down Expand Up @@ -477,7 +477,7 @@ void oz_cdev_rx(struct oz_pd *pd, struct oz_elt *elt)
int ix;

ctx = oz_cdev_claim_ctx(pd);
if (ctx == 0) {
if (ctx == NULL) {
oz_trace("Cannot claim serial context.\n");
return;
}
Expand Down

0 comments on commit b5f120a

Please sign in to comment.