Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325896
b: refs/heads/master
c: dc2cdca
h: refs/heads/master
v: v3
  • Loading branch information
Sachin Kamat authored and Felipe Balbi committed Sep 3, 2012
1 parent 909ee11 commit 00040db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: affaab4c58d8e5f7c30ca2be351277cf72d2336f
refs/heads/master: dc2cdcaf4caafeb069d01704fdfda24f9c1f443a
8 changes: 4 additions & 4 deletions trunk/drivers/usb/gadget/s3c-hsudc.c
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ static struct usb_request *s3c_hsudc_alloc_request(struct usb_ep *_ep,

hsreq = kzalloc(sizeof(*hsreq), gfp_flags);
if (!hsreq)
return 0;
return NULL;

INIT_LIST_HEAD(&hsreq->queue);
return &hsreq->req;
Expand Down Expand Up @@ -904,16 +904,16 @@ static int s3c_hsudc_queue(struct usb_ep *_ep, struct usb_request *_req,
csr = readl((u32)hsudc->regs + offset);
if (!(csr & S3C_ESR_TX_SUCCESS) &&
(s3c_hsudc_write_fifo(hsep, hsreq) == 1))
hsreq = 0;
hsreq = NULL;
} else {
csr = readl((u32)hsudc->regs + offset);
if ((csr & S3C_ESR_RX_SUCCESS)
&& (s3c_hsudc_read_fifo(hsep, hsreq) == 1))
hsreq = 0;
hsreq = NULL;
}
}

if (hsreq != 0)
if (hsreq)
list_add_tail(&hsreq->queue, &hsep->queue);

spin_unlock_irqrestore(&hsudc->lock, flags);
Expand Down

0 comments on commit 00040db

Please sign in to comment.