diff options
| author |  David S. Miller <davem@davemloft.net>
| 2012-02-19 16:03:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2012-02-19 16:03:15 -0500 |
| commit | 32efe08d77f5902ce7315fc9003c010ffffb8268 (patch) | |
| tree | 40a88e6bae4e797cafce33f16a25e350c038f9bb /drivers/pinctrl/core.c | |
| parent | cisco/enic: use eth_hw_addr_random() instead of random_ether_addr() (diff) | |
| parent | Linux 3.3-rc4 (diff) | |
| download | linux-32efe08d77f5902ce7315fc9003c010ffffb8268.tar.gz linux-32efe08d77f5902ce7315fc9003c010ffffb8268.tar.bz2 linux-32efe08d77f5902ce7315fc9003c010ffffb8268.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/pinctrl/core.c')
| -rw-r--r-- | drivers/pinctrl/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 8fe15cf15ac8..894cd5e103da 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -189,7 +189,7 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev, pindesc->pctldev = pctldev; /* Copy basic pin info */ - if (pindesc->name) { + if (name) { pindesc->name = name; } else { pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", number); |