diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/scsi/sd.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index b61ebec6bca7..bd0806e64e85 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -1055,7 +1055,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo) | |||
| 1055 | * @arg: this is third argument given to ioctl(2) system call. | 1055 | * @arg: this is third argument given to ioctl(2) system call. |
| 1056 | * Often contains a pointer. | 1056 | * Often contains a pointer. |
| 1057 | * | 1057 | * |
| 1058 | * Returns 0 if successful (some ioctls return postive numbers on | 1058 | * Returns 0 if successful (some ioctls return positive numbers on |
| 1059 | * success as well). Returns a negated errno value in case of error. | 1059 | * success as well). Returns a negated errno value in case of error. |
| 1060 | * | 1060 | * |
| 1061 | * Note: most ioctls are forward onto the block subsystem or further | 1061 | * Note: most ioctls are forward onto the block subsystem or further |