Merge commit 'v2.6.27-rc3' into x86/prototypes

Conflicts:

	include/asm-x86/dma-mapping.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 2 insertions, 2 deletions

diff --git a/samples/firmware_class/firmware_sample_firmware_class.c b/samples/firmware_class/firmware_sample_firmware_class.c
index 9392116e47b0..e6cf7a43a297 100644
--- a/samples/firmware_class/firmware_sample_firmware_class.c
+++ b/samples/firmware_class/firmware_sample_firmware_class.c
@@ -124,7 +124,7 @@ static int fw_setup_class_device(struct class_device *class_dev,
         class_dev->class_id[BUS_ID_SIZE-1] = '\0';
         class_dev->dev = device;
 
-        class_dev->class = &firmware_class,
+        class_dev->class = &firmware_class;
         class_set_devdata(class_dev, fw_priv);
         retval = class_device_register(class_dev);
         if (retval) {
diff --git a/samples/kobject/kset-example.c b/samples/kobject/kset-example.c
index b0a1b4fe6584..7395c0bbae18 100644
--- a/samples/kobject/kset-example.c
+++ b/samples/kobject/kset-example.c
@@ -211,7 +211,7 @@ static struct foo_obj *create_foo_obj(const char *name)
          */
         retval = kobject_init_and_add(&foo->kobj, &foo_ktype, NULL, "%s", name);
         if (retval) {
-                kfree(foo);
+                kobject_put(&foo->kobj);
                 return NULL;
         }