Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cc8b6f5 authored Jul 10, 2006 by Andrew Morton Committed by David S. Miller Jul 13, 2006

[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>

parent e47f3178

arch/sparc/kernel/of_device.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -695,9 +695,11 @@ int of_device_register(struct of_device *ofdev)
		if (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)

arch/sparc64/kernel/of_device.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -922,9 +922,11 @@ int of_device_register(struct of_device *ofdev)
		if (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)