projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
drivers
/
usb
/
gadget
/
f_mass_storage.c
diff --git
a/drivers/usb/gadget/f_mass_storage.c
b/drivers/usb/gadget/f_mass_storage.c
index
b1fe8bd
..
f896169
100644
(file)
--- a/
drivers/usb/gadget/f_mass_storage.c
+++ b/
drivers/usb/gadget/f_mass_storage.c
@@
-2515,7
+2515,7
@@
static struct fsg_common *fsg_common_init(struct fsg_common *common,
buffhds_first_it:
bh->inreq_busy = 0;
bh->outreq_busy = 0;
buffhds_first_it:
bh->inreq_busy = 0;
bh->outreq_busy = 0;
- bh->buf =
kmalloc(FSG_BUFLEN, GFP_KERNEL
);
+ bh->buf =
memalign(CONFIG_SYS_CACHELINE_SIZE, FSG_BUFLEN
);
if (unlikely(!bh->buf)) {
rc = -ENOMEM;
goto error_release;
if (unlikely(!bh->buf)) {
rc = -ENOMEM;
goto error_release;
@@
-2622,7
+2622,7
@@
usb_copy_descriptors(struct usb_descriptor_header **src)
bytes += (*tmp)->bLength;
bytes += (n_desc + 1) * sizeof(*tmp);
bytes += (*tmp)->bLength;
bytes += (n_desc + 1) * sizeof(*tmp);
- mem =
kmalloc(bytes, GFP_KERNEL
);
+ mem =
memalign(CONFIG_SYS_CACHELINE_SIZE, bytes
);
if (!mem)
return NULL;
if (!mem)
return NULL;