File tree Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -204,21 +204,19 @@ static int soc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
204
204
205
205
for (i = 0 ; i < ARRAY_SIZE (skt -> stat ); i ++ ) {
206
206
if (gpio_is_valid (skt -> stat [i ].gpio )) {
207
- unsigned long flags = GPIOF_IN ;
208
-
209
- /* CD is active low by default */
210
- if (i == SOC_STAT_CD )
211
- flags |= GPIOF_ACTIVE_LOW ;
212
-
213
207
ret = devm_gpio_request_one (skt -> socket .dev .parent ,
214
- skt -> stat [i ].gpio , flags ,
208
+ skt -> stat [i ].gpio , GPIOF_IN ,
215
209
skt -> stat [i ].name );
216
210
if (ret ) {
217
211
__soc_pcmcia_hw_shutdown (skt , i );
218
212
return ret ;
219
213
}
220
214
221
215
skt -> stat [i ].desc = gpio_to_desc (skt -> stat [i ].gpio );
216
+
217
+ /* CD is active low by default */
218
+ if ((i == SOC_STAT_CD ) ^ gpiod_is_active_low (skt -> stat [i ].desc ))
219
+ gpiod_toggle_active_low (skt -> stat [i ].desc );
222
220
}
223
221
224
222
if (i < SOC_STAT_VS1 && skt -> stat [i ].desc ) {
You can’t perform that action at this time.
0 commit comments