Merge commit 'origin/master' into for-linus/xen/master

[mv-sheeva.git] / drivers / staging / usbip / vhci_sysfs.c

diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c
index 0fd33a62d93470a8e5fea1430c4187d52a1dfb97..e4c71435aa11d397bff493184abcdd9ee7db286d 100644 (file)
--- a/drivers/staging/usbip/vhci_sysfs.c
+++ b/drivers/staging/usbip/vhci_sysfs.c
@@ -31,8 +31,7 @@ static ssize_t show_status(struct device *dev, struct device_attribute *attr,
        char *s = out;
        int i = 0;
 
-       if (!the_controller || !out)
-               BUG();
+       BUG_ON(!the_controller || !out);
 
        spin_lock(&the_controller->lock);