diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 22:15:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 22:47:38 +0100 |
| commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
| tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /drivers/isdn | |
| parent | isdn/hisax: fix compiler warning on hisax_pci_tbl (diff) | |
| parent | tcp: protect sysctl_tcp_cookie_size reads (diff) | |
| download | linux-fe6c791570efe717946ea7b7dd50aec96b70d551.tar.xz linux-fe6c791570efe717946ea7b7dd50aec96b70d551.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/icn/icn.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c index 2e847a90bad0..f2b5bab5e6a1 100644 --- a/drivers/isdn/icn/icn.c +++ b/drivers/isdn/icn/icn.c @@ -1627,7 +1627,7 @@ __setup("icn=", icn_setup); static int __init icn_init(void) { char *p; - char rev[10]; + char rev[20]; memset(&dev, 0, sizeof(icn_dev)); dev.memaddr = (membase & 0x0ffc000); @@ -1637,9 +1637,10 @@ static int __init icn_init(void) spin_lock_init(&dev.devlock); if ((p = strchr(revision, ':'))) { - strcpy(rev, p + 1); + strncpy(rev, p + 1, 20); p = strchr(rev, '$'); - *p = 0; + if (p) + *p = 0; } else strcpy(rev, " ??? "); printk(KERN_NOTICE "ICN-ISDN-driver Rev%smem=0x%08lx\n", rev, |