aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/muxes/i2c-mux-pca954x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c/muxes/i2c-mux-pca954x.c')
-rw-r--r--drivers/i2c/muxes/i2c-mux-pca954x.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index f2dfe0d8fcc..8e4387235b6 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -186,7 +186,7 @@ static int pca954x_probe(struct i2c_client *client,
186{ 186{
187 struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent); 187 struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
188 struct pca954x_platform_data *pdata = client->dev.platform_data; 188 struct pca954x_platform_data *pdata = client->dev.platform_data;
189 int num, force; 189 int num, force, class;
190 struct pca954x *data; 190 struct pca954x *data;
191 int ret = -ENODEV; 191 int ret = -ENODEV;
192 192
@@ -216,18 +216,20 @@ static int pca954x_probe(struct i2c_client *client,
216 /* Now create an adapter for each channel */ 216 /* Now create an adapter for each channel */
217 for (num = 0; num < chips[data->type].nchans; num++) { 217 for (num = 0; num < chips[data->type].nchans; num++) {
218 force = 0; /* dynamic adap number */ 218 force = 0; /* dynamic adap number */
219 class = 0; /* no class by default */
219 if (pdata) { 220 if (pdata) {
220 if (num < pdata->num_modes) 221 if (num < pdata->num_modes) {
221 /* force static number */ 222 /* force static number */
222 force = pdata->modes[num].adap_id; 223 force = pdata->modes[num].adap_id;
223 else 224 class = pdata->modes[num].class;
225 } else
224 /* discard unconfigured channels */ 226 /* discard unconfigured channels */
225 break; 227 break;
226 } 228 }
227 229
228 data->virt_adaps[num] = 230 data->virt_adaps[num] =
229 i2c_add_mux_adapter(adap, &client->dev, client, 231 i2c_add_mux_adapter(adap, &client->dev, client,
230 force, num, pca954x_select_chan, 232 force, num, class, pca954x_select_chan,
231 (pdata && pdata->modes[num].deselect_on_exit) 233 (pdata && pdata->modes[num].deselect_on_exit)
232 ? pca954x_deselect_mux : NULL); 234 ? pca954x_deselect_mux : NULL);
233 235