aboutsummaryrefslogtreecommitdiff
path: root/drivers/s390/char/vmur.c
diff options
context:
space:
mode:
authorGravatar Jean Delvare <jdelvare@suse.de> 2017-09-18 11:13:13 +0200
committerGravatar Martin Schwidefsky <schwidefsky@de.ibm.com> 2017-09-28 07:29:41 +0200
commitb08e19defc10befc50af09771ff0b086f2a72138 (patch)
tree7d1b4a799d66482d9deb8109dbabbde18d3f3804 /drivers/s390/char/vmur.c
parentsamples/kprobes: Add s390 case in kprobe example module (diff)
downloadlinux-b08e19defc10befc50af09771ff0b086f2a72138.tar.gz
linux-b08e19defc10befc50af09771ff0b086f2a72138.tar.bz2
linux-b08e19defc10befc50af09771ff0b086f2a72138.zip
s390/char: fix cdev_add usage
Function cdev_add does set cdev->dev, so there is no point in setting it prior to calling this function. Signed-off-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char/vmur.c')
-rw-r--r--drivers/s390/char/vmur.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 04aceb694d51..a50cf930a623 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -892,10 +892,9 @@ static int ur_set_online(struct ccw_device *cdev)
}
urd->char_device->ops = &ur_fops;
- urd->char_device->dev = MKDEV(major, minor);
urd->char_device->owner = ur_fops.owner;
- rc = cdev_add(urd->char_device, urd->char_device->dev, 1);
+ rc = cdev_add(urd->char_device, MKDEV(major, minor), 1);
if (rc)
goto fail_free_cdev;
if (urd->cdev->id.cu_type == READER_PUNCH_DEVTYPE) {