| block2mtd.c (4f2c0a4acffbec01079c28f839422e64ddeff004) | block2mtd.c (0718afd47f70cf46877c39c25d06b786e1a3f36c) |
|---|---|
| 1/* 2 * block2mtd.c - create an mtd from a block device 3 * 4 * Copyright (C) 2001,2002 Simon Evans <spse@secret.org.uk> 5 * Copyright (C) 2004-2006 Joern Engel <joern@wh.fh-wedel.de> 6 * 7 * Licence: GPL 8 */ --- 221 unchanged lines hidden (view full) --- 230 if (!devname) 231 return NULL; 232 233 dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL); 234 if (!dev) 235 return NULL; 236 237 /* Get a handle on the device */ | 1/* 2 * block2mtd.c - create an mtd from a block device 3 * 4 * Copyright (C) 2001,2002 Simon Evans <spse@secret.org.uk> 5 * Copyright (C) 2004-2006 Joern Engel <joern@wh.fh-wedel.de> 6 * 7 * Licence: GPL 8 */ --- 221 unchanged lines hidden (view full) --- 230 if (!devname) 231 return NULL; 232 233 dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL); 234 if (!dev) 235 return NULL; 236 237 /* Get a handle on the device */ |
| 238 bdev = blkdev_get_by_path(devname, mode, dev); | 238 bdev = blkdev_get_by_path(devname, mode, dev, NULL); |
| 239 240#ifndef MODULE 241 /* 242 * We might not have the root device mounted at this point. 243 * Try to resolve the device name by other means. 244 */ 245 for (i = 0; IS_ERR(bdev) && i <= timeout; i++) { 246 dev_t devt; --- 5 unchanged lines hidden (view full) --- 252 * go-arounds. 253 */ 254 msleep(1000); 255 wait_for_device_probe(); 256 257 devt = name_to_dev_t(devname); 258 if (!devt) 259 continue; | 239 240#ifndef MODULE 241 /* 242 * We might not have the root device mounted at this point. 243 * Try to resolve the device name by other means. 244 */ 245 for (i = 0; IS_ERR(bdev) && i <= timeout; i++) { 246 dev_t devt; --- 5 unchanged lines hidden (view full) --- 252 * go-arounds. 253 */ 254 msleep(1000); 255 wait_for_device_probe(); 256 257 devt = name_to_dev_t(devname); 258 if (!devt) 259 continue; |
| 260 bdev = blkdev_get_by_dev(devt, mode, dev); | 260 bdev = blkdev_get_by_dev(devt, mode, dev, NULL); |
| 261 } 262#endif 263 264 if (IS_ERR(bdev)) { 265 pr_err("error: cannot open device %s\n", devname); 266 goto err_free_block2mtd; 267 } 268 dev->blkdev = bdev; --- 243 unchanged lines hidden --- | 261 } 262#endif 263 264 if (IS_ERR(bdev)) { 265 pr_err("error: cannot open device %s\n", devname); 266 goto err_free_block2mtd; 267 } 268 dev->blkdev = bdev; --- 243 unchanged lines hidden --- |