mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-27 06:54:15 +02:00
97d0245acb
Fixes for the following warnings: drivers/mtd/devices/block2mtd.c: In function '_open_bdev': drivers/mtd/devices/block2mtd.c:272:3: warning: ISO C90 forbids mixed declarations and code drivers/mtd/devices/block2mtd.c: In function 'add_device': drivers/mtd/devices/block2mtd.c:399:13: warning: assignment discards qualifiers from pointer target type In the case of 442-block2mtd_probe.patch, it's not until the insertion of a executable statement before the definition that causes a warning, so I've chosen to resolve the issue here by splitting the definition and the initialization into a definition and a statement (and assignment) instead. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27007 3c298f89-4303-0410-b956-a3cf2f4a3e73
17 lines
566 B
Diff
17 lines
566 B
Diff
--- a/drivers/mtd/devices/block2mtd.c
|
|
+++ b/drivers/mtd/devices/block2mtd.c
|
|
@@ -264,10 +264,12 @@ static int _open_bdev(struct block2mtd_d
|
|
bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
|
|
#ifndef MODULE
|
|
if (IS_ERR(bdev)) {
|
|
+ dev_t devt;
|
|
|
|
/* We might not have rootfs mounted at this point. Try
|
|
to resolve the device name by other means. */
|
|
|
|
+ wait_for_device_probe();
|
|
- dev_t devt = name_to_dev_t(dev->devname);
|
|
+ devt = name_to_dev_t(dev->devname);
|
|
if (devt) {
|
|
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
|