diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/mmc.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/onenand/onenand_base.c | 5 | ||||
| -rw-r--r-- | drivers/net/xilinx_ll_temac.c | 4 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-omap.c | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index e70fa9f8dc..596732e80e 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -179,7 +179,7 @@ int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) for (i = 0; i < 4; i++) { int j; printf("\t\t\t\t\t%03d - ", i*4); - ptr = &cmd->response[i]; + ptr = (u8 *)&cmd->response[i]; ptr += 3; for (j = 0; j < 4; j++) printf("%02X ", *ptr--); diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 480ae7a207..1d0f196c12 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -2574,7 +2574,7 @@ static int onenand_chip_probe(struct mtd_info *mtd) int onenand_probe(struct mtd_info *mtd) { struct onenand_chip *this = mtd->priv; - int maf_id, dev_id, ver_id; + int dev_id, ver_id; int density; int ret; @@ -2582,8 +2582,7 @@ int onenand_probe(struct mtd_info *mtd) if (ret) return ret; - /* Read manufacturer and device IDs from Register */ - maf_id = this->read_word(this->base + ONENAND_REG_MANUFACTURER_ID); + /* Read device IDs from Register */ dev_id = this->read_word(this->base + ONENAND_REG_DEVICE_ID); ver_id = this->read_word(this->base + ONENAND_REG_VERSION_ID); this->technology = this->read_word(this->base + ONENAND_REG_TECHNOLOGY); diff --git a/drivers/net/xilinx_ll_temac.c b/drivers/net/xilinx_ll_temac.c index 85660c0216..27dafc15c0 100644 --- a/drivers/net/xilinx_ll_temac.c +++ b/drivers/net/xilinx_ll_temac.c @@ -298,9 +298,9 @@ int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf) /* use given name or generate its own unique name */ if (devinf->devname) { - strncpy(dev->name, devinf->devname, NAMESIZE); + strncpy(dev->name, devinf->devname, sizeof(dev->name)); } else { - snprintf(dev->name, NAMESIZE, "lltemac.%lx", devinf->base_addr); + snprintf(dev->name, sizeof(dev->name), "lltemac.%lx", devinf->base_addr); devinf->devname = dev->name; } diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 00f787fc97..1ed77107eb 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -200,12 +200,12 @@ int omap_ehci_hcd_init(struct omap_usbhs_board_data *usbhs_pdata) if (is_ehci_phy_mode(usbhs_pdata->port_mode[1])) clrbits_le32(®, OMAP_UHH_HOSTCONFIG_ULPI_P2_BYPASS); else - setbits_le32(®, OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS); + setbits_le32(®, OMAP_UHH_HOSTCONFIG_ULPI_P2_BYPASS); if (is_ehci_phy_mode(usbhs_pdata->port_mode[2])) clrbits_le32(®, OMAP_UHH_HOSTCONFIG_ULPI_P3_BYPASS); else - setbits_le32(®, OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS); + setbits_le32(®, OMAP_UHH_HOSTCONFIG_ULPI_P3_BYPASS); } else if (rev == OMAP_USBHS_REV2) { clrsetbits_le32(®, (OMAP_P1_MODE_CLEAR | OMAP_P2_MODE_CLEAR), OMAP4_UHH_HOSTCONFIG_APP_START_CLK); |