diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 16:28:21 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 16:28:21 +0200 |
| commit | 8f9044927dd3c0cf9abe6c1254d76886291becbb (patch) | |
| tree | 03aa87cc32fc19f20157912aef3001bc94a7fd29 /drivers/mtd/nor | |
| parent | 89fd7e44dbe754366354cee37395f7fc11cce50e (diff) | |
| parent | 9aad0fb2d616ee4fb5bd359d9053ffd47dbd399b (diff) | |
| download | barebox-8f9044927dd3c0cf9abe6c1254d76886291becbb.tar.gz barebox-8f9044927dd3c0cf9abe6c1254d76886291becbb.tar.xz | |
Merge branch 'for-next/mci'
Conflicts:
include/driver.h
Diffstat (limited to 'drivers/mtd/nor')
| -rw-r--r-- | drivers/mtd/nor/cfi_flash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/nor/cfi_flash.c b/drivers/mtd/nor/cfi_flash.c index 7a8ffb638c..51fc6bc89f 100644 --- a/drivers/mtd/nor/cfi_flash.c +++ b/drivers/mtd/nor/cfi_flash.c @@ -990,6 +990,8 @@ static int cfi_probe (struct device_d *dev) dev_info(dev, "found cfi flash at %p, size %ld\n", info->base, info->size); + dev->info = cfi_info; + cfi_init_mtd(info); return 0; @@ -1006,7 +1008,6 @@ static __maybe_unused struct of_device_id cfi_dt_ids[] = { static struct driver_d cfi_driver = { .name = "cfi_flash", .probe = cfi_probe, - .info = cfi_info, .of_compatible = DRV_OF_COMPAT(cfi_dt_ids), }; device_platform_driver(cfi_driver); |