From: Pete Zaitcev <zaitcev@redhat.com>
Date: Sat, 29 Apr 2006 03:45:49 +0000 (-0700)
Subject: [PATCH] USB: clean out an unnecessary NULL check from ub
X-Git-Tag: v2.6.18-rc1~858^2~98
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=41fea55e0382b7d59d694d8055b39aa69c793b1f;p=~shefty%2Frdma-dev.git

[PATCH] USB: clean out an unnecessary NULL check from ub

Remove the check for NULL which makes no sense. Suggested by Al.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index c688c25992e..8eb44a55b9b 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1651,15 +1651,11 @@ static void ub_revalidate(struct ub_dev *sc, struct ub_lun *lun)
 static int ub_bd_open(struct inode *inode, struct file *filp)
 {
 	struct gendisk *disk = inode->i_bdev->bd_disk;
-	struct ub_lun *lun;
-	struct ub_dev *sc;
+	struct ub_lun *lun = disk->private_data;
+	struct ub_dev *sc = lun->udev;
 	unsigned long flags;
 	int rc;
 
-	if ((lun = disk->private_data) == NULL)
-		return -ENXIO;
-	sc = lun->udev;
-
 	spin_lock_irqsave(&ub_lock, flags);
 	if (atomic_read(&sc->poison)) {
 		spin_unlock_irqrestore(&ub_lock, flags);