diff options
author | Andrew Morton <akpm@osdl.org> | 2006-07-10 18:28:54 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-13 04:50:01 -0400 |
commit | 6cc8b6f51eb1af72882c279f691c5de7d5a43bf2 (patch) | |
tree | a7806a7c0e9016508806a80ca4ef0ff59225f5d2 /arch/sparc64 | |
parent | e47f31787dee5bf57453e18edefff56e17fa44f9 (diff) |
[SPARC64]: of_device_register() error checking fix
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>
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/of_device.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c index 169b017eec0b..8e177a0abc1c 100644 --- a/arch/sparc64/kernel/of_device.c +++ b/arch/sparc64/kernel/of_device.c | |||
@@ -922,9 +922,11 @@ int of_device_register(struct of_device *ofdev) | |||
922 | if (rc) | 922 | if (rc) |
923 | return rc; | 923 | return rc; |
924 | 924 | ||
925 | device_create_file(&ofdev->dev, &dev_attr_devspec); | 925 | rc = device_create_file(&ofdev->dev, &dev_attr_devspec); |
926 | if (rc) | ||
927 | device_unregister(&ofdev->dev); | ||
926 | 928 | ||
927 | return 0; | 929 | return rc; |
928 | } | 930 | } |
929 | 931 | ||
930 | void of_device_unregister(struct of_device *ofdev) | 932 | void of_device_unregister(struct of_device *ofdev) |