Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285719
b: refs/heads/master
c: eabd0ea
h: refs/heads/master
i:
  285717: ad3fa3e
  285715: c89f116
  285711: 916d918
v: v3
  • Loading branch information
Julia Lawall authored and Mauro Carvalho Chehab committed Jan 6, 2012
1 parent 4020aef commit a15c331
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: 75e5ac7ea57ea56628f73a8a0aaf58f758aae43a
refs/heads/master: eabd0eaf4f390df102cd24a87300b0e5150cf189
12 changes: 6 additions & 6 deletions trunk/drivers/staging/media/as102/as102_usb_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,19 +353,19 @@ static int as102_usb_probe(struct usb_interface *intf,

ENTER();

as102_dev = kzalloc(sizeof(struct as102_dev_t), GFP_KERNEL);
if (as102_dev == NULL) {
err("%s: kzalloc failed", __func__);
return -ENOMEM;
}

/* This should never actually happen */
if ((sizeof(as102_usb_id_table) / sizeof(struct usb_device_id)) !=
(sizeof(as102_device_names) / sizeof(const char *))) {
pr_err("Device names table invalid size");
return -EINVAL;
}

as102_dev = kzalloc(sizeof(struct as102_dev_t), GFP_KERNEL);
if (as102_dev == NULL) {
err("%s: kzalloc failed", __func__);
return -ENOMEM;
}

/* Assign the user-friendly device name */
for (i = 0; i < (sizeof(as102_usb_id_table) /
sizeof(struct usb_device_id)); i++) {
Expand Down

0 comments on commit a15c331

Please sign in to comment.