diff --git a/[refs] b/[refs]
index 457d7ba2580b..3449a873b56a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2f9e49f9bbfa2e111ab1e1628b96b560bae7cec
+refs/heads/master: 76e3a19d0691bbfcc559ce77ab3004818fab8f22
diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c
index 8f0bd3f7a59f..516925d8b570 100644
--- a/trunk/drivers/scsi/sg.c
+++ b/trunk/drivers/scsi/sg.c
@@ -1078,7 +1078,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
 	case BLKTRACESETUP:
 		return blk_trace_setup(sdp->device->request_queue,
 				       sdp->disk->disk_name,
-				       sdp->device->sdev_gendev.devt,
+				       MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
 				       (char *)arg);
 	case BLKTRACESTART:
 		return blk_trace_startstop(sdp->device->request_queue, 1);