From: James Bottomley <jejb@titanic.(none)>
Date: Sun, 28 Aug 2005 16:40:00 +0000 (-0500)
Subject: Merge by hand (conflicts in sr.c)
X-Git-Tag: v2.6.14-rc1~522^2~2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ba482ef4b16bad5172d2be693d4b2420b84c84e7;p=linux-2.6-omap-h63xx.git

Merge by hand (conflicts in sr.c)
---

ba482ef4b16bad5172d2be693d4b2420b84c84e7
diff --cc drivers/scsi/sr.c
index 39fc5b0fbc1,f63d8c6c2a3..ce63fc8312d
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@@ -736,8 -729,9 +717,7 @@@ out
  
  Enomem:
  	cd->capacity = 0x1fffff;
- 	sector_size = 2048;	/* A guess, just in case */
- 	cd->needs_sector_size = 1;
+ 	cd->device->sector_size = 2048;	/* A guess, just in case */
 -	if (SRpnt)
 -		scsi_release_request(SRpnt);
  	goto out;
  }