|
@@ -1071,20 +1071,21 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
|
|
|
- /* Request gpio only if cs line is asserted by gpio pins */
|
|
|
- if (sdd->cs_gpio) {
|
|
|
- err = gpio_request_one(cs->line, GPIOF_OUT_INIT_HIGH,
|
|
|
- dev_name(&spi->dev));
|
|
|
- if (err) {
|
|
|
- dev_err(&spi->dev,
|
|
|
- "Failed to get /CS gpio [%d]: %d\n",
|
|
|
- cs->line, err);
|
|
|
- goto err_gpio_req;
|
|
|
+ if (!spi_get_ctldata(spi)) {
|
|
|
+ /* Request gpio only if cs line is asserted by gpio pins */
|
|
|
+ if (sdd->cs_gpio) {
|
|
|
+ err = gpio_request_one(cs->line, GPIOF_OUT_INIT_HIGH,
|
|
|
+ dev_name(&spi->dev));
|
|
|
+ if (err) {
|
|
|
+ dev_err(&spi->dev,
|
|
|
+ "Failed to get /CS gpio [%d]: %d\n",
|
|
|
+ cs->line, err);
|
|
|
+ goto err_gpio_req;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- if (!spi_get_ctldata(spi))
|
|
|
spi_set_ctldata(spi, cs);
|
|
|
+ }
|
|
|
|
|
|
sci = sdd->cntrlr_info;
|
|
|
|