projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-crypto' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
cdrom
/
cdrom.c
diff --git
a/drivers/cdrom/cdrom.c
b/drivers/cdrom/cdrom.c
index d620b44957454a80fcf444d10cb967e66fb9d7d5..8a3aff724d989c331f5de1596f3064cbbe72c271 100644
(file)
--- a/
drivers/cdrom/cdrom.c
+++ b/
drivers/cdrom/cdrom.c
@@
-2882,7
+2882,7
@@
static noinline int mmc_ioctl_cdrom_read_data(struct cdrom_device_info *cdi,
if (lba < 0)
return -EINVAL;
- cgc->buffer = k
m
alloc(blocksize, GFP_KERNEL);
+ cgc->buffer = k
z
alloc(blocksize, GFP_KERNEL);
if (cgc->buffer == NULL)
return -ENOMEM;