2 files changed, 4 insertions, 4 deletions

diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c
index f84f3e505788..fa8ab2815a98 100644
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c
@@ -176,7 +176,7 @@ int soundbus_add_one(struct soundbus_dev *dev)
                 return -EINVAL;
         }
 
-        snprintf(dev->ofdev.dev.bus_id, BUS_ID_SIZE, "soundbus:%x", ++devcount);
+        dev_set_name(&dev->ofdev.dev, "soundbus:%x", ++devcount);
         dev->ofdev.dev.bus = &soundbus_bus_type;
         return of_device_register(&dev->ofdev);
 }
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index e6beb92c6933..b4590df07466 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -159,7 +159,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
         struct i2sbus_dev *dev;
         struct device_node *child = NULL, *sound = NULL;
         struct resource *r;
-        int i, layout = 0, rlen;
+        int i, layout = 0, rlen, ok = force;
         static const char *rnames[] = { "i2sbus: %s (control)",
                                         "i2sbus: %s (tx)",
                                         "i2sbus: %s (rx)" };
@@ -192,7 +192,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
                         layout = *layout_id;
                         snprintf(dev->sound.modalias, 32,
                                  "sound-layout-%d", layout);
-                        force = 1;
+                        ok = 1;
                 }
         }
         /* for the time being, until we can handle non-layout-id
@@ -201,7 +201,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
          * When there are two i2s busses and only one has a layout-id,
          * then this depends on the order, but that isn't important
          * either as the second one in that case is just a modem. */
-        if (!force) {
+        if (!ok) {
                 kfree(dev);
                 return -ENODEV;
         }