Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

[linux-2.6] / drivers / block / paride / dstr.c

diff --git a/drivers/block/paride/dstr.c b/drivers/block/paride/dstr.c
index 2e4219eac5289171f36d2a1e97b7ddb86be3c0ad..accc5c777cbba7efa0aca7ea09ba0cfa08df0b48 100644 (file)
--- a/drivers/block/paride/dstr.c
+++ b/drivers/block/paride/dstr.c
@@ -220,7 +220,7 @@ static struct pi_protocol dstr = {
 
 static int __init dstr_init(void)
 {
-       return paride_register(&dstr)-1;
+       return paride_register(&dstr);
 }
 
 static void __exit dstr_exit(void)