diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:52 +0200 |
| commit | 7b4e61bbf9462b38b496f8e151052c3081125aa4 (patch) | |
| tree | a3da6659cf5b8745292ef7f2927b17a4deb05b17 /common/blspec.c | |
| parent | f2a2894c27db8f5785bfc7fbaddce8873c16661f (diff) | |
| parent | 221033e217e3a9778d81088801fae45e986ff2e8 (diff) | |
| download | barebox-7b4e61bbf9462b38b496f8e151052c3081125aa4.tar.gz barebox-7b4e61bbf9462b38b496f8e151052c3081125aa4.tar.xz | |
Merge branch 'for-next/mtd'
Conflicts:
drivers/mtd/core.c
Diffstat (limited to 'common/blspec.c')
| -rw-r--r-- | common/blspec.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/common/blspec.c b/common/blspec.c index aef246d7f5..7e84ff3cec 100644 --- a/common/blspec.c +++ b/common/blspec.c @@ -615,17 +615,10 @@ int blspec_scan_devicename(struct blspec *blspec, const char *devname) { struct device_d *dev; struct cdev *cdev; - const char *colon; pr_debug("%s: %s\n", __func__, devname); - colon = strchr(devname, '.'); - if (colon) { - char *name = xstrdup(devname); - *strchr(name, '.') = 0; - device_detect_by_name(name); - free(name); - } + device_detect_by_name(devname); cdev = cdev_by_name(devname); if (cdev) { |