diff options
| author | Tom Rini <trini@ti.com> | 2014-10-23 14:05:34 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-23 14:05:34 -0400 |
| commit | 03a3536c7b7f2902932606da9248c6f08318174a (patch) | |
| tree | 414815bd812360c88c338416f5bb6c67ed7ba75d /drivers | |
| parent | 7bfd5ee1170eca10d26858b6b2ed36317cc686fd (diff) | |
| parent | 9aafef4f360616a507578b8868092f096b093aa9 (diff) | |
| download | u-boot-imx-03a3536c7b7f2902932606da9248c6f08318174a.zip u-boot-imx-03a3536c7b7f2902932606da9248c6f08318174a.tar.gz u-boot-imx-03a3536c7b7f2902932606da9248c6f08318174a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/tegra_gpio.c | 3 | ||||
| -rw-r--r-- | drivers/mmc/tegra_mmc.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c index 1cc4abb..70663fc 100644 --- a/drivers/gpio/tegra_gpio.c +++ b/drivers/gpio/tegra_gpio.c @@ -171,6 +171,9 @@ static int tegra_gpio_request(struct udevice *dev, unsigned offset, { struct tegra_port_info *state = dev_get_priv(dev); + if (!label) + return -EINVAL; + if (*state->label[offset]) return -EBUSY; diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index ca9c4aa..2642fe2 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -292,7 +292,7 @@ static int mmc_send_cmd_bounced(struct mmc *mmc, struct mmc_cmd *cmd, /* Transfer Complete */ debug("r/w is done\n"); break; - } else if (get_timer(start) > 2000UL) { + } else if (get_timer(start) > 8000UL) { writel(mask, &host->reg->norintsts); printf("%s: MMC Timeout\n" " Interrupt status 0x%08x\n" |