diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-01 22:15:01 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-01 22:15:01 -0700 |
| commit | 2cdd2bd9854b9b39cc785426f77e7e71622a9a16 (patch) | |
| tree | 1a109591c0edbb5ec4171d75f0e623c3f674b6b7 /usb | |
| parent | d657a97eecfd1352a8550a8b3194a06b293610a7 (diff) | |
| download | patches-2cdd2bd9854b9b39cc785426f77e7e71622a9a16.tar.gz | |
pci patches
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-clean-out-an-unnecessary-null-check-from-ub.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/usb/usb-clean-out-an-unnecessary-null-check-from-ub.patch b/usb/usb-clean-out-an-unnecessary-null-check-from-ub.patch new file mode 100644 index 0000000000000..059bf6df4ceeb --- /dev/null +++ b/usb/usb-clean-out-an-unnecessary-null-check-from-ub.patch @@ -0,0 +1,37 @@ +From zaitcev@redhat.com Fri Apr 28 20:46:08 2006 +Date: Fri, 28 Apr 2006 20:45:49 -0700 +From: Pete Zaitcev <zaitcev@redhat.com> +To: greg@kroah.com +Cc: zaitcev@redhat.com +Subject: USB: clean out an unnecessary NULL check from ub +Message-Id: <20060428204549.da0cf683.zaitcev@redhat.com> + +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> + +--- + drivers/block/ub.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +--- gregkh-2.6.orig/drivers/block/ub.c ++++ gregkh-2.6/drivers/block/ub.c +@@ -1646,15 +1646,11 @@ static void ub_revalidate(struct ub_dev + 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); |