mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge commit 'origin/master' into next
This commit is contained in:
commit
4b337c5f24
1229 changed files with 141221 additions and 15181 deletions
|
|
@ -122,7 +122,7 @@ static int __devinit of_platform_serial_probe(struct of_device *ofdev,
|
|||
|
||||
info->type = port_type;
|
||||
info->line = ret;
|
||||
ofdev->dev.driver_data = info;
|
||||
dev_set_drvdata(&ofdev->dev, info);
|
||||
return 0;
|
||||
out:
|
||||
kfree(info);
|
||||
|
|
@ -135,7 +135,7 @@ out:
|
|||
*/
|
||||
static int of_platform_serial_remove(struct of_device *ofdev)
|
||||
{
|
||||
struct of_serial_info *info = ofdev->dev.driver_data;
|
||||
struct of_serial_info *info = dev_get_drvdata(&ofdev->dev);
|
||||
switch (info->type) {
|
||||
#ifdef CONFIG_SERIAL_8250
|
||||
case PORT_8250 ... PORT_MAX_8250:
|
||||
|
|
|
|||
Loading…
Reference in a new issue