| Message ID | 1437600802-2522-1-git-send-email-swarren@wwwdotorg.org |
|---|---|
| State | Accepted |
| Delegated to: | Tom Warren |
| Headers | show |
On 07/22/2015 03:33 PM, Stephen Warren wrote: Apparently Heiko is out-of-the-office until Aug 10th. Tom Rini, perhaps you could apply this directly to u-boot.git, or ack it so that Tom Warren can apply it to the Tegra tree? The basic Tegra210 SoC patches will rely on these warnings being fixed, and I'd rather not hold off getting the SoC patches applied until mid-August. > drivers/i2c/tegra_i2c.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c > index fc9564699489..a4289788a65c 100644 > --- a/drivers/i2c/tegra_i2c.c > +++ b/drivers/i2c/tegra_i2c.c > @@ -235,7 +235,7 @@ static int send_recv_packets(struct i2c_bus *i2c_bus, > if ((words == 1) && last_bytes) { > local = 0; > memcpy(&local, dptr, last_bytes); > - } else if ((unsigned)dptr & 3) { > + } else if ((unsigned long)dptr & 3) { > memcpy(&local, dptr, sizeof(u32)); > } else { > local = *wptr; > @@ -258,7 +258,7 @@ static int send_recv_packets(struct i2c_bus *i2c_bus, > local = readl(&control->rx_fifo); > if ((words == 1) && last_bytes) > memcpy(dptr, (char *)&local, last_bytes); > - else if ((unsigned)dptr & 3) > + else if ((unsigned long)dptr & 3) > memcpy(dptr, &local, sizeof(u32)); > else > *wptr = local;
On Wed, Jul 22, 2015 at 03:33:22PM -0600, Stephen Warren wrote: > From: Thierry Reding <treding@nvidia.com> > > Signed-off-by: Thierry Reding <treding@nvidia.com> > Signed-off-by: Tom Warren <twarren@nvidia.com> > Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Tom Rini <trini@konsulko.com>
On 22 July 2015 at 15:33, Stephen Warren <swarren@wwwdotorg.org> wrote: > From: Thierry Reding <treding@nvidia.com> > > Signed-off-by: Thierry Reding <treding@nvidia.com> > Signed-off-by: Tom Warren <twarren@nvidia.com> > Signed-off-by: Stephen Warren <swarren@nvidia.com> > --- > drivers/i2c/tegra_i2c.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c index fc9564699489..a4289788a65c 100644 --- a/drivers/i2c/tegra_i2c.c +++ b/drivers/i2c/tegra_i2c.c @@ -235,7 +235,7 @@ static int send_recv_packets(struct i2c_bus *i2c_bus, if ((words == 1) && last_bytes) { local = 0; memcpy(&local, dptr, last_bytes); - } else if ((unsigned)dptr & 3) { + } else if ((unsigned long)dptr & 3) { memcpy(&local, dptr, sizeof(u32)); } else { local = *wptr; @@ -258,7 +258,7 @@ static int send_recv_packets(struct i2c_bus *i2c_bus, local = readl(&control->rx_fifo); if ((words == 1) && last_bytes) memcpy(dptr, (char *)&local, last_bytes); - else if ((unsigned)dptr & 3) + else if ((unsigned long)dptr & 3) memcpy(dptr, &local, sizeof(u32)); else *wptr = local;