Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / drivers / char / bsr.c

diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index cf39bc08ce08e3a0dbfa975cdc7fda4d053e656e..0c688232aab3596824cd37ce4f1c6b0a4f90a351 100644 (file)
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -212,7 +212,7 @@ static int bsr_add_node(struct device_node *bn)
 
                cur->bsr_minor  = i + total_bsr_devs;
                cur->bsr_addr   = res.start;
-               cur->bsr_len    = res.end - res.start + 1;
+               cur->bsr_len    = resource_size(&res);
                cur->bsr_bytes  = bsr_bytes[i];
                cur->bsr_stride = bsr_stride[i];
                cur->bsr_dev    = MKDEV(bsr_major, i + total_bsr_devs);