* [PATCH v1] input: tegra-kbc: Fix build error.
@ 2011-01-28 22:03 riyer
2011-01-28 22:09 ` Dmitry Torokhov
0 siblings, 1 reply; 3+ messages in thread
From: riyer @ 2011-01-28 22:03 UTC (permalink / raw)
To: dmitry.torokhov
Cc: olof, achew, linux-tegra, linux-kernel, linux-input, Rakesh Iyer
From: Rakesh Iyer <riyer@nvidia.com>
Fix build error introduced by variable name change.
Signed-off-by: Rakesh Iyer <riyer@nvidia.com>
---
drivers/input/keyboard/tegra-kbc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 6ca903a..ac471b7 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -355,8 +355,8 @@ static void tegra_kbc_config_pins(struct tegra_kbc *kbc)
for (i = 0; i < KBC_MAX_GPIO; i++) {
u32 r_shft = 5 * (i % 6);
u32 c_shft = 4 * (i % 8);
- u32 r_mask = 0x1f << r_shift;
- u32 c_mask = 0x0f << c_shift;
+ u32 r_mask = 0x1f << r_shft;
+ u32 c_mask = 0x0f << c_shft;
u32 r_offs = (i / 6) * 4 + KBC_ROW_CFG0_0;
u32 c_offs = (i / 8) * 4 + KBC_COL_CFG0_0;
u32 row_cfg = readl(kbc->mmio + r_offs);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v1] input: tegra-kbc: Fix build error.
2011-01-28 22:03 [PATCH v1] input: tegra-kbc: Fix build error riyer
@ 2011-01-28 22:09 ` Dmitry Torokhov
2011-01-28 22:18 ` Rakesh Iyer
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Torokhov @ 2011-01-28 22:09 UTC (permalink / raw)
To: riyer; +Cc: olof, achew, linux-tegra, linux-kernel, linux-input
On Fri, Jan 28, 2011 at 02:03:33PM -0800, riyer@nvidia.com wrote:
> From: Rakesh Iyer <riyer@nvidia.com>
>
> Fix build error introduced by variable name change.
>
Did I manage to pick up wrong version?
> Signed-off-by: Rakesh Iyer <riyer@nvidia.com>
> ---
> drivers/input/keyboard/tegra-kbc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
> index 6ca903a..ac471b7 100644
> --- a/drivers/input/keyboard/tegra-kbc.c
> +++ b/drivers/input/keyboard/tegra-kbc.c
> @@ -355,8 +355,8 @@ static void tegra_kbc_config_pins(struct tegra_kbc *kbc)
> for (i = 0; i < KBC_MAX_GPIO; i++) {
> u32 r_shft = 5 * (i % 6);
> u32 c_shft = 4 * (i % 8);
> - u32 r_mask = 0x1f << r_shift;
> - u32 c_mask = 0x0f << c_shift;
> + u32 r_mask = 0x1f << r_shft;
> + u32 c_mask = 0x0f << c_shft;
> u32 r_offs = (i / 6) * 4 + KBC_ROW_CFG0_0;
> u32 c_offs = (i / 8) * 4 + KBC_COL_CFG0_0;
> u32 row_cfg = readl(kbc->mmio + r_offs);
> --
> 1.7.0.4
>
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [PATCH v1] input: tegra-kbc: Fix build error.
2011-01-28 22:09 ` Dmitry Torokhov
@ 2011-01-28 22:18 ` Rakesh Iyer
0 siblings, 0 replies; 3+ messages in thread
From: Rakesh Iyer @ 2011-01-28 22:18 UTC (permalink / raw)
To: 'Dmitry Torokhov'
Cc: olof@lixom.net, Andrew Chew, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-input@vger.kernel.org
No I think this slipped in, due to a last minute change to get the code < 80 lines.
Regards
Rakesh
> -----Original Message-----
> From: Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com]
> Sent: Friday, January 28, 2011 2:10 PM
> To: Rakesh Iyer
> Cc: olof@lixom.net; Andrew Chew; linux-tegra@vger.kernel.org; linux-
> kernel@vger.kernel.org; linux-input@vger.kernel.org
> Subject: Re: [PATCH v1] input: tegra-kbc: Fix build error.
>
> On Fri, Jan 28, 2011 at 02:03:33PM -0800, riyer@nvidia.com wrote:
> > From: Rakesh Iyer <riyer@nvidia.com>
> >
> > Fix build error introduced by variable name change.
> >
>
> Did I manage to pick up wrong version?
>
> > Signed-off-by: Rakesh Iyer <riyer@nvidia.com>
> > ---
> > drivers/input/keyboard/tegra-kbc.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
> > index 6ca903a..ac471b7 100644
> > --- a/drivers/input/keyboard/tegra-kbc.c
> > +++ b/drivers/input/keyboard/tegra-kbc.c
> > @@ -355,8 +355,8 @@ static void tegra_kbc_config_pins(struct tegra_kbc *kbc)
> > for (i = 0; i < KBC_MAX_GPIO; i++) {
> > u32 r_shft = 5 * (i % 6);
> > u32 c_shft = 4 * (i % 8);
> > - u32 r_mask = 0x1f << r_shift;
> > - u32 c_mask = 0x0f << c_shift;
> > + u32 r_mask = 0x1f << r_shft;
> > + u32 c_mask = 0x0f << c_shft;
> > u32 r_offs = (i / 6) * 4 + KBC_ROW_CFG0_0;
> > u32 c_offs = (i / 8) * 4 + KBC_COL_CFG0_0;
> > u32 row_cfg = readl(kbc->mmio + r_offs);
> > --
> > 1.7.0.4
> >
>
> --
> Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-28 22:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-28 22:03 [PATCH v1] input: tegra-kbc: Fix build error riyer
2011-01-28 22:09 ` Dmitry Torokhov
2011-01-28 22:18 ` Rakesh Iyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).