diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/block/acsi_slm.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/block/acsi_slm.c')
| -rw-r--r-- | drivers/block/acsi_slm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c index a5c1c8e871ec..4cb9c1336287 100644 --- a/drivers/block/acsi_slm.c +++ b/drivers/block/acsi_slm.c | |||
| @@ -369,8 +369,6 @@ static ssize_t slm_read( struct file *file, char *buf, size_t count, | |||
| 369 | int length; | 369 | int length; |
| 370 | int end; | 370 | int end; |
| 371 | 371 | ||
| 372 | if (count < 0) | ||
| 373 | return( -EINVAL ); | ||
| 374 | if (!(page = __get_free_page( GFP_KERNEL ))) | 372 | if (!(page = __get_free_page( GFP_KERNEL ))) |
| 375 | return( -ENOMEM ); | 373 | return( -ENOMEM ); |
| 376 | 374 | ||