Merge branch 'linux-2.6'

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index b8e342fe7586..8f25f628ef16 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -114,7 +114,7 @@ static void dec_count(struct io *io, unsigned int region, int error)
                         wake_up_process(io->sleeper);
 
                 else {
-                        int r = io->error;
+                        unsigned long r = io->error;
                         io_notify_fn fn = io->callback;
                         void *context = io->context;