Date: | 2011-07-06 16:23:53 (12 years 8 months ago) |
---|---|
Author: | Werner Almesberger |
Commit: | 0d21f45f7a0daba3e2d83b9e9083ea558a9b1b54 |
Message: | atusb: renamed ctrl_urb to just "urb" Signed-off-by: Werner Almesberger <werner@almesberger.net> |
Files: |
drivers/spi/atusb.c (2 diffs) |
Change Details
drivers/spi/atusb.c | ||
---|---|---|
232 | 232 | { |
233 | 233 | struct usb_device *dev = atusb->udev; |
234 | 234 | struct usb_ctrlrequest *req; |
235 | struct urb *ctrl_urb; | |
235 | struct urb *urb; | |
236 | 236 | int retval = -ENOMEM; |
237 | 237 | |
238 | 238 | req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL); |
... | ... | |
245 | 245 | req->wIndex = cpu_to_le16(index); |
246 | 246 | req->wLength = cpu_to_le16(size); |
247 | 247 | |
248 | ctrl_urb = usb_alloc_urb(0, GFP_KERNEL); | |
249 | if (!ctrl_urb) | |
248 | urb = usb_alloc_urb(0, GFP_KERNEL); | |
249 | if (!urb) | |
250 | 250 | goto out_nourb; |
251 | 251 | |
252 | usb_fill_control_urb(ctrl_urb, dev, | |
252 | usb_fill_control_urb(urb, dev, | |
253 | 253 | requesttype == ATUSB_FROM_DEV ? |
254 | 254 | usb_rcvctrlpipe(dev, 0) : usb_sndctrlpipe(dev, 0), |
255 | 255 | (unsigned char *) req, data, size, complete_fn, context); |
256 | 256 | |
257 | retval = usb_submit_urb(ctrl_urb, GFP_KERNEL); | |
257 | retval = usb_submit_urb(urb, GFP_KERNEL); | |
258 | 258 | if (!retval) |
259 | 259 | return 0; |
260 | 260 | dev_info(&dev->dev, "failed submitting read urb, error %d", |
261 | 261 | retval); |
262 | 262 | retval = retval == -ENOMEM ? retval : -EIO; |
263 | 263 | |
264 | usb_free_urb(ctrl_urb); | |
264 | usb_free_urb(urb); | |
265 | 265 | out_nourb: |
266 | 266 | kfree(req); |
267 | 267 |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9