diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mci/atmel-sdhci.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_bbt.c | 4 | ||||
| -rw-r--r-- | drivers/usb/dwc2/core.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mci/atmel-sdhci.c b/drivers/mci/atmel-sdhci.c index 59cd002aae..380a79d33e 100644 --- a/drivers/mci/atmel-sdhci.c +++ b/drivers/mci/atmel-sdhci.c @@ -24,7 +24,7 @@ struct at91_sdhci_priv { struct mci_host mci; struct clk *hclock, *gck, *mainck; bool cal_always_on; - u32 gck_rate; + int gck_rate; }; #define to_priv(h) container_of(h, struct at91_sdhci_priv, mci) diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 0b48373e6a..a86b5b2da3 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -528,7 +528,6 @@ static int search_bbt(struct nand_chip *this, uint8_t *buf, { u64 targetsize = nanddev_target_size(&this->base); struct mtd_info *mtd = nand_to_mtd(this); - struct nand_bbt_descr *bd = this->badblock_pattern; int i, chips; int startblock, block, dir; int scanlen = mtd->writesize + mtd->oobsize; @@ -564,9 +563,6 @@ static int search_bbt(struct nand_chip *this, uint8_t *buf, int actblock = startblock + dir * block; loff_t offs = (loff_t)actblock << this->bbt_erase_shift; - /* Check if block is marked bad */ - if (scan_block_fast(this, bd, offs, buf)) - continue; /* Read first page */ scan_read(this, buf, offs, mtd->writesize, td); if (!check_pattern(buf, scanlen, mtd->writesize, td)) { diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c index 5d04a07b03..8a78d8199e 100644 --- a/drivers/usb/dwc2/core.c +++ b/drivers/usb/dwc2/core.c @@ -688,7 +688,7 @@ int dwc2_get_dr_mode(struct dwc2 *dwc2) */ void dwc2_wait_for_mode(struct dwc2 *dwc2, bool host_mode) { - unsigned int timeout = 110 * USECOND; + unsigned int timeout = 110 * MSECOND; int ret; dev_vdbg(dwc2->dev, "Waiting for %s mode\n", |