projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for_paulus
[linux-drm-fsl-dcu.git]
/
drivers
/
macintosh
/
smu.c
diff --git
a/drivers/macintosh/smu.c
b/drivers/macintosh/smu.c
index 6dde27ab79a817a1c9899eac5a319754e8d8f534..3096836d8bd3309e35b459d2684b6688838ff58e 100644
(file)
--- a/
drivers/macintosh/smu.c
+++ b/
drivers/macintosh/smu.c
@@
-945,7
+945,7
@@
static struct smu_sdbp_header *smu_create_sdb_partition(int id)
*/
tlen = sizeof(struct property) + len + 18;
*/
tlen = sizeof(struct property) + len + 18;
- prop = k
calloc(tlen, 1
, GFP_KERNEL);
+ prop = k
zalloc(tlen
, GFP_KERNEL);
if (prop == NULL)
return NULL;
hdr = (struct smu_sdbp_header *)(prop + 1);
if (prop == NULL)
return NULL;
hdr = (struct smu_sdbp_header *)(prop + 1);
@@
-1277,7
+1277,7
@@
static int smu_release(struct inode *inode, struct file *file)
}
}
-static struct file_operations smu_device_fops = {
+static
const
struct file_operations smu_device_fops = {
.llseek = no_llseek,
.read = smu_read,
.write = smu_write,
.llseek = no_llseek,
.read = smu_read,
.write = smu_write,