Merge branches 'core/futexes', 'core/locking', 'core/rcu' and 'linus' into core/urgent

[sfrench/cifs-2.6.git] / mm / backing-dev.c

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index f3b125857827440d22b18895e97729741e151a24..a7c6c5613ec9fed872bc9a22ca819321f7353889 100644 (file)
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -176,6 +176,9 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent,
        int ret = 0;
        struct device *dev;
 
+       if (bdi->dev)   /* The driver needs to use separate queues per device */
+               goto exit;
+
        va_start(args, fmt);
        dev = device_create_vargs(bdi_class, parent, MKDEV(0, 0), bdi, fmt, args);
        va_end(args);