X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fscsi%2Fsd.c;h=7ba70bef8b5d03e8f5cd41ab35e2906123381e56;hb=520a2c2741747062e75f91cd0faddb564fbc64d2;hp=7e22aa7b8b8a9072f806497bbfed7377fa09e86f;hpb=a8659597bf744b0f8d2560e2a734b5c941569e0e;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 7e22aa7b8b8..7ba70bef8b5 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1436,7 +1436,7 @@ got_data:
 
 	{
 		char cap_str_2[10], cap_str_10[10];
-		u64 sz = sdkp->capacity << ffz(~sector_size);
+		u64 sz = (u64)sdkp->capacity << ilog2(sector_size);
 
 		string_get_size(sz, STRING_UNITS_2, cap_str_2,
 				sizeof(cap_str_2));