Skip to content

Commit

Permalink
Merge branch 'spi-fix-s3c64xx' into spi-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Nov 7, 2012
2 parents 7032449 + 45e5033 commit fad8f9c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/spi/spi-s3c64xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,7 @@ static int s3c64xx_spi_parse_dt_gpio(struct s3c64xx_spi_driver_data *sdd)
dev_err(dev, "invalid gpio[%d]: %d\n", idx, gpio);
goto free_gpio;
}

sdd->gpios[idx] = gpio;
ret = gpio_request(gpio, "spi-bus");
if (ret) {
dev_err(dev, "gpio [%d] request failed: %d\n",
Expand Down

0 comments on commit fad8f9c

Please sign in to comment.