git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
block
/
acsi_slm.c
diff --git
a/drivers/block/acsi_slm.c
b/drivers/block/acsi_slm.c
index
e3be8c3
..
4cb9c13
100644
(file)
--- a/
drivers/block/acsi_slm.c
+++ b/
drivers/block/acsi_slm.c
@@
-268,7
+268,7
@@
static int slm_get_pagesize( int device, int *w, int *h );
/************************* End of Prototypes **************************/
/************************* End of Prototypes **************************/
-static
struct timer_list slm_timer = TIMER_INITIALIZER(
slm_test_ready, 0, 0);
+static
DEFINE_TIMER(slm_timer,
slm_test_ready, 0, 0);
static struct file_operations slm_fops = {
.owner = THIS_MODULE,
static struct file_operations slm_fops = {
.owner = THIS_MODULE,
@@
-369,8
+369,6
@@
static ssize_t slm_read( struct file *file, char *buf, size_t count,
int length;
int end;
int length;
int end;
- if (count < 0)
- return( -EINVAL );
if (!(page = __get_free_page( GFP_KERNEL )))
return( -ENOMEM );
if (!(page = __get_free_page( GFP_KERNEL )))
return( -ENOMEM );