| Message ID | 20140123205456.10e45ea0baff94cf3f785a21@skynet.be |
|---|---|
| State | Rejected |
| Headers | show |
On Thu, Jan 23, 2014 at 08:54:56PM +0100, Fabian Frederick wrote: > mutex_init declared when mtd structure is available > > Signed-off-by: Fabian Frederick <fabf@skynet.be> > --- > drivers/mtd/devices/block2mtd.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c > index f0fd4fc..5b9b145 100644 > --- a/drivers/mtd/devices/block2mtd.c > +++ b/drivers/mtd/devices/block2mtd.c > @@ -254,16 +254,15 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) > goto devinit_err1; > } > > + name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); > + if (!name) > + goto devinit_err1; > + > mutex_init(&dev->write_mutex); > > /* Setup the MTD structure */ > /* make the name contain the block device in */ > - name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); > - if (!name) > - goto devinit_err2; > - > dev->mtd.name = name; > - > dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK; > dev->mtd.erasesize = erase_size; > dev->mtd.writesize = 1; > -- > 1.8.1.4 Hm.. this change doesn't seem to make sense. You just moved the name format to happen before the mutex_init. I wonder if I'm missing something.
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index f0fd4fc..5b9b145 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c @@ -254,16 +254,15 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) goto devinit_err1; } + name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); + if (!name) + goto devinit_err1; + mutex_init(&dev->write_mutex); /* Setup the MTD structure */ /* make the name contain the block device in */ - name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); - if (!name) - goto devinit_err2; - dev->mtd.name = name; - dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK; dev->mtd.erasesize = erase_size; dev->mtd.writesize = 1;
mutex_init declared when mtd structure is available Signed-off-by: Fabian Frederick <fabf@skynet.be> --- drivers/mtd/devices/block2mtd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)