Merge remote branch 'origin/master' of /home/airlied/kernel//linux-2.6 into drm-core-next

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 2714becc2eaf..ffa0689ee840 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -870,7 +870,7 @@ static int sd_release(struct gendisk *disk, fmode_t mode)
 
         SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_release\n"));
 
-        if (atomic_dec_return(&sdkp->openers) && sdev->removable) {
+        if (atomic_dec_return(&sdkp->openers) == 0 && sdev->removable) {
                 if (scsi_block_when_processing_errors(sdev))
                         scsi_set_medium_removal(sdev, SCSI_REMOVAL_ALLOW);
         }
@@ -2625,15 +2625,15 @@ module_exit(exit_sd);
 static void sd_print_sense_hdr(struct scsi_disk *sdkp,
                                struct scsi_sense_hdr *sshdr)
 {
-        sd_printk(KERN_INFO, sdkp, "");
+        sd_printk(KERN_INFO, sdkp, " ");
         scsi_show_sense_hdr(sshdr);
-        sd_printk(KERN_INFO, sdkp, "");
+        sd_printk(KERN_INFO, sdkp, " ");
         scsi_show_extd_sense(sshdr->asc, sshdr->ascq);
 }
 
 static void sd_print_result(struct scsi_disk *sdkp, int result)
 {
-        sd_printk(KERN_INFO, sdkp, "");
+        sd_printk(KERN_INFO, sdkp, " ");
         scsi_show_result(result);
 }