lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'origin/master' into next

Browse Source
This commit is contained in:
Benjamin Herrenschmidt
2009-06-18 11:16:55 +10:00
parent 492b057c42 3fe0344faf
commit 4b337c5f24
1229 changed files with 141539 additions and 15499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/serial/of_serial.c
View File

@@ -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: