From e6d69663cbffe9eba4f280ef6eecdea94115eb77 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 15 Jan 2008 13:17:47 +0900 Subject: [PATCH] --- yaml --- r: 77132 b: refs/heads/master c: a24484f281dda11e4fc0041a51907d3564da3d7f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sg.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 589c2c8621b2..7a76b5a4dc2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d814c5173c671cf2c88d4e07db01b13312467ecd +refs/heads/master: a24484f281dda11e4fc0041a51907d3564da3d7f diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c index e65f5d432662..ebbf9b4b7e90 100644 --- a/trunk/drivers/scsi/sg.c +++ b/trunk/drivers/scsi/sg.c @@ -1422,7 +1422,6 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf) goto out; } - class_set_devdata(cl_dev, sdp); error = cdev_add(cdev, MKDEV(SCSI_GENERIC_MAJOR, sdp->index), 1); if (error) goto cdev_add_err; @@ -1451,6 +1450,8 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf) "Attached scsi generic sg%d type %d\n", sdp->index, scsidp->type); + class_set_devdata(cl_dev, sdp); + return 0; cdev_add_err: