diff --git a/[refs] b/[refs]
index 60c300798e66..92de8255c4c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45d7f0cc58183062adea0a1de3d8cba768134138
+refs/heads/master: 2a8cfad06ebbb68e8c113a39bdd653297fb9369c
diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c
index bd0806e64e85..1c69c14be0cd 100644
--- a/trunk/drivers/scsi/sd.c
+++ b/trunk/drivers/scsi/sd.c
@@ -490,7 +490,8 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode)
 	unsigned int max_blocks = 0;
 
 	q->limits.discard_zeroes_data = sdkp->lbprz;
-	q->limits.discard_alignment = sdkp->unmap_alignment;
+	q->limits.discard_alignment = sdkp->unmap_alignment *
+		logical_block_size;
 	q->limits.discard_granularity =
 		max(sdkp->physical_block_size,
 		    sdkp->unmap_granularity * logical_block_size);