Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 63209
b: refs/heads/master
c: a947522
h: refs/heads/master
i:
  63207: 12aa529
v: v3
  • Loading branch information
David Brownell authored and Greg Kroah-Hartman committed Jul 30, 2007
1 parent d8130a9 commit b3daa4b
Show file tree
Hide file tree
Showing 7 changed files with 12 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: bc71e479cdb2caab9b4473f7ad508c3fcb142486
refs/heads/master: a9475226977917afd5a85621f8a3d7f380a9da31
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ usb_descriptor_fillbuf(void *buf, unsigned buflen,
return -EINVAL;

/* fill buffer from src[] until null descriptor ptr */
for (; 0 != *src; src++) {
for (; NULL != *src; src++) {
unsigned len = (*src)->bLength;

if (len > buflen)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/epautoconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ep_matches (
u16 max;

/* endpoint already claimed? */
if (0 != ep->driver_data)
if (NULL != ep->driver_data)
return 0;

/* only support ep0 for portable CONTROL traffic */
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/usb/gadget/ether.c
Original file line number Diff line number Diff line change
Expand Up @@ -1723,7 +1723,8 @@ rx_submit (struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)
size += sizeof (struct rndis_packet_msg_type);
size -= size % dev->out_ep->maxpacket;

if ((skb = alloc_skb (size + NET_IP_ALIGN, gfp_flags)) == 0) {
skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags);
if (skb == NULL) {
DEBUG (dev, "no rx skb\n");
goto enomem;
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/gadget/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ static int setup_req (struct usb_ep *ep, struct usb_request *req, u16 len)
}
if (len > sizeof (dev->rbuf))
req->buf = kmalloc(len, GFP_ATOMIC);
if (req->buf == 0) {
if (req->buf == NULL) {
req->buf = dev->rbuf;
return -ENOMEM;
}
Expand Down Expand Up @@ -1394,7 +1394,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
dev->setup_abort = 0;
if (dev->state == STATE_DEV_UNCONNECTED) {
#ifdef CONFIG_USB_GADGET_DUALSPEED
if (gadget->speed == USB_SPEED_HIGH && dev->hs_config == 0) {
if (gadget->speed == USB_SPEED_HIGH && dev->hs_config == NULL) {
spin_unlock(&dev->lock);
ERROR (dev, "no high speed config??\n");
return -EINVAL;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/m66592-udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,7 @@ static int m66592_queue(struct usb_ep *_ep, struct usb_request *_req,
req->req.actual = 0;
req->req.status = -EINPROGRESS;

if (ep->desc == 0) /* control */
if (ep->desc == NULL) /* control */
start_ep0(ep, req);
else {
if (request && !ep->busy)
Expand Down
6 changes: 4 additions & 2 deletions trunk/drivers/usb/gadget/zero.c
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,8 @@ set_source_sink_config (struct zero_dev *dev, gfp_t gfp_flags)
result = usb_ep_enable (ep, d);
if (result == 0) {
ep->driver_data = dev;
if (source_sink_start_ep (ep, gfp_flags) != 0) {
if (source_sink_start_ep(ep, gfp_flags)
!= NULL) {
dev->in_ep = ep;
continue;
}
Expand All @@ -667,7 +668,8 @@ set_source_sink_config (struct zero_dev *dev, gfp_t gfp_flags)
result = usb_ep_enable (ep, d);
if (result == 0) {
ep->driver_data = dev;
if (source_sink_start_ep (ep, gfp_flags) != 0) {
if (source_sink_start_ep(ep, gfp_flags)
!= NULL) {
dev->out_ep = ep;
continue;
}
Expand Down

0 comments on commit b3daa4b

Please sign in to comment.