iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SPARC64]: of_device_register() error checking fix

Browse Source 
device_create_file() can fail.  This causes the sparc64 compile to
fail when my fanatical __must_check patch is applied, due to -Werror.

[ Added necessary identical fix for sparc32. -DaveM]

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Morton 2006-07-10 15:28:54 -07:00 committed by David S. Miller
parent e47f31787d
commit 6cc8b6f51e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sparc/kernel/of_device.c
View File

@ -695,9 +695,11 @@ int of_device_register(struct of_device *ofdev)
if (rc) if (rc)
return rc; return rc;
device_create_file(&ofdev->dev, &dev_attr_devspec); rc = device_create_file(&ofdev->dev, &dev_attr_devspec);
if (rc)
device_unregister(&ofdev->dev);
return 0; return rc;
} }
void of_device_unregister(struct of_device *ofdev) void of_device_unregister(struct of_device *ofdev)

6
arch/sparc64/kernel/of_device.c
View File

@ -922,9 +922,11 @@ int of_device_register(struct of_device *ofdev)
if (rc) if (rc)
return rc; return rc;
device_create_file(&ofdev->dev, &dev_attr_devspec); rc = device_create_file(&ofdev->dev, &dev_attr_devspec);
if (rc)
device_unregister(&ofdev->dev);
return 0; return rc;
} }
void of_device_unregister(struct of_device *ofdev) void of_device_unregister(struct of_device *ofdev)