summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-07-29 12:03:40 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-07-29 12:03:40 +0200
commitffcf536cef0fe90bb0b7340b82492ce0a54a0dc6 (patch)
treedbffc92a48a327937a5ec415064c791d7147d37a /drivers/base
parent8f24f965e117444c1b253c14621d80fcaf31554c (diff)
parent02b1926f5aabf2c8043de576ae159d63e35961f1 (diff)
downloadbarebox-ffcf536cef0fe90bb0b7340b82492ce0a54a0dc6.tar.gz
barebox-ffcf536cef0fe90bb0b7340b82492ce0a54a0dc6.tar.xz
Merge branch 'pu' into next
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index b5166c82e..78e9ea917 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -284,9 +284,9 @@ EXPORT_SYMBOL(dummy_probe);
const char *dev_id(const struct device_d *dev)
{
- static char buf[sizeof(unsigned long) * 2];
+ static char buf[MAX_DRIVER_NAME + 16];
- sprintf(buf, FORMAT_DRIVER_MANE_ID, dev->name, dev->id);
+ snprintf(buf, sizeof(buf), FORMAT_DRIVER_NAME_ID, dev->name, dev->id);
return buf;
}