diff options
| -rw-r--r-- | sound/aoa/soundbus/i2sbus/i2sbus-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
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, | |||
| 159 | struct i2sbus_dev *dev; | 159 | struct i2sbus_dev *dev; |
| 160 | struct device_node *child = NULL, *sound = NULL; | 160 | struct device_node *child = NULL, *sound = NULL; |
| 161 | struct resource *r; | 161 | struct resource *r; |
| 162 | int i, layout = 0, rlen; | 162 | int i, layout = 0, rlen, ok = force; |
| 163 | static const char *rnames[] = { "i2sbus: %s (control)", | 163 | static const char *rnames[] = { "i2sbus: %s (control)", |
| 164 | "i2sbus: %s (tx)", | 164 | "i2sbus: %s (tx)", |
| 165 | "i2sbus: %s (rx)" }; | 165 | "i2sbus: %s (rx)" }; |
| @@ -192,7 +192,7 @@ static int i2sbus_add_dev(struct macio_dev *macio, | |||
| 192 | layout = *layout_id; | 192 | layout = *layout_id; |
| 193 | snprintf(dev->sound.modalias, 32, | 193 | snprintf(dev->sound.modalias, 32, |
| 194 | "sound-layout-%d", layout); | 194 | "sound-layout-%d", layout); |
| 195 | force = 1; | 195 | ok = 1; |
| 196 | } | 196 | } |
| 197 | } | 197 | } |
| 198 | /* for the time being, until we can handle non-layout-id | 198 | /* for the time being, until we can handle non-layout-id |
| @@ -201,7 +201,7 @@ static int i2sbus_add_dev(struct macio_dev *macio, | |||
| 201 | * When there are two i2s busses and only one has a layout-id, | 201 | * When there are two i2s busses and only one has a layout-id, |
| 202 | * then this depends on the order, but that isn't important | 202 | * then this depends on the order, but that isn't important |
| 203 | * either as the second one in that case is just a modem. */ | 203 | * either as the second one in that case is just a modem. */ |
| 204 | if (!force) { | 204 | if (!ok) { |
| 205 | kfree(dev); | 205 | kfree(dev); |
| 206 | return -ENODEV; | 206 | return -ENODEV; |
| 207 | } | 207 | } |
