xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3.18-rc4 into tty-next.

Browse Source 
This resolves a merge issue with drivers/tty/serial/8250/8250_mtk.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2014-11-10 12:42:04 +09:00
parent 98267d33e2 206c5f60a3
commit 394e849b83
203 changed files with 1530 additions and 1469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/serial/of_serial.c
View File

@@ -170,7 +170,7 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
if (of_find_property(ofdev->dev.of_node, "used-by-rtas", NULL))
return -EBUSY;
info = kmalloc(sizeof(*info), GFP_KERNEL);
info = kzalloc(sizeof(*info), GFP_KERNEL);
if (info == NULL)
return -ENOMEM;