diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2014-08-29 15:21:10 -0500 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2014-08-29 15:21:10 -0500 |
| commit | da1090a73f312b14db0d7a93a9c9373fffd34958 (patch) | |
| tree | e2f125a1abc3bf72d56e38493b53750d7f8c8c61 /io-module/spi.c | |
| parent | 19a9fd0f6bb179fce8061b3080e93f94a37eeabe (diff) | |
| parent | 19018dbbb35bd2940721ea6f04400a58c9644839 (diff) | |
| download | mts-io-da1090a73f312b14db0d7a93a9c9373fffd34958.tar.gz mts-io-da1090a73f312b14db0d7a93a9c9373fffd34958.tar.bz2 mts-io-da1090a73f312b14db0d7a93a9c9373fffd34958.zip | |
Merge branch 'master' of sw.multitech.prv:/git/jjg/cdp-io-controller
Conflicts:
io-module/mts_eeprom.h
io-module/mts_io.c
io-module/spi.c
Diffstat (limited to 'io-module/spi.c')
| -rw-r--r-- | io-module/spi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/io-module/spi.c b/io-module/spi.c index 74d81d2..ce5c156 100644 --- a/io-module/spi.c +++ b/io-module/spi.c @@ -599,7 +599,7 @@ static int mts_spi_dc_dout_probe(struct spi_device *spi) { int tmp; - if (! has_accessory_card || mts_dc_product_id != MTDC_GPIOB_0_0) { + if (! has_accessory_card_port_1 || mts_ap1_product_id != MTDC_GPIOB_0_0) { log_error("accessory card digital outputs not available"); return -ENODEV; } @@ -645,7 +645,7 @@ static int mts_spi_dc_din_probe(struct spi_device *spi) { int tmp; - if (! has_accessory_card || mts_dc_product_id != MTDC_GPIOB_0_0) { + if (! has_accessory_card_port_1 || mts_ap1_product_id != MTDC_GPIOB_0_0) { log_error("accessory card digital inputs not available"); return -ENODEV; } @@ -688,7 +688,7 @@ static int mts_spi_dc_adc_probe(struct spi_device *spi) { int tmp; - if (! has_accessory_card || mts_dc_product_id != MTDC_GPIOB_0_0) { + if (! has_accessory_card_port_1 || mts_ap1_product_id != MTDC_GPIOB_0_0) { log_error("accessory card analog to digital not available"); return -ENODEV; } |