Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 22035
b: refs/heads/master
c: 29da793
h: refs/heads/master
i:
  22033: e9ad844
  22031: e832aa0
v: v3
  • Loading branch information
Pete Zaitcev authored and Greg Kroah-Hartman committed Mar 20, 2006
1 parent f1a3bf2 commit 80fbaec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 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: 9ee884cc89dc339276c719ab4ff53913ac03d083
refs/heads/master: 29da7937a11a47bad64558c3be4d998c4ea5e823
12 changes: 4 additions & 8 deletions trunk/drivers/block/ub.c
Original file line number Diff line number Diff line change
Expand Up @@ -2007,9 +2007,8 @@ static int ub_sync_tur(struct ub_dev *sc, struct ub_lun *lun)
init_completion(&compl);

rc = -ENOMEM;
if ((cmd = kmalloc(ALLOC_SIZE, GFP_KERNEL)) == NULL)
if ((cmd = kzalloc(ALLOC_SIZE, GFP_KERNEL)) == NULL)
goto err_alloc;
memset(cmd, 0, ALLOC_SIZE);

cmd->cdb[0] = TEST_UNIT_READY;
cmd->cdb_len = 6;
Expand Down Expand Up @@ -2062,9 +2061,8 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun,
init_completion(&compl);

rc = -ENOMEM;
if ((cmd = kmalloc(ALLOC_SIZE, GFP_KERNEL)) == NULL)
if ((cmd = kzalloc(ALLOC_SIZE, GFP_KERNEL)) == NULL)
goto err_alloc;
memset(cmd, 0, ALLOC_SIZE);
p = (char *)cmd + sizeof(struct ub_scsi_cmd);

cmd->cdb[0] = 0x25;
Expand Down Expand Up @@ -2405,9 +2403,8 @@ static int ub_probe(struct usb_interface *intf,
return -ENXIO;

rc = -ENOMEM;
if ((sc = kmalloc(sizeof(struct ub_dev), GFP_KERNEL)) == NULL)
if ((sc = kzalloc(sizeof(struct ub_dev), GFP_KERNEL)) == NULL)
goto err_core;
memset(sc, 0, sizeof(struct ub_dev));
sc->lock = ub_next_lock();
INIT_LIST_HEAD(&sc->luns);
usb_init_urb(&sc->work_urb);
Expand Down Expand Up @@ -2524,9 +2521,8 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum)
int rc;

rc = -ENOMEM;
if ((lun = kmalloc(sizeof(struct ub_lun), GFP_KERNEL)) == NULL)
if ((lun = kzalloc(sizeof(struct ub_lun), GFP_KERNEL)) == NULL)
goto err_alloc;
memset(lun, 0, sizeof(struct ub_lun));
lun->num = lnum;

rc = -ENOSR;
Expand Down

0 comments on commit 80fbaec

Please sign in to comment.