Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dfd0621 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] dpt_i2o: Add PROC_IA64 define
  [SCSI] scsi_host regression: fix scsi host leak
  [SCSI] sr: fix corrupt CD data after media change and delay
parents f32c23f5 f93daa3f

drivers/scsi/dpt/dptsig.h

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ typedef unsigned int sigINT; 
/* ------------------------------------------------------------------ */

/* What type of processor the file is meant to run on. */

/* This will let us know whether to read sigWORDs as high/low or low/high. */

#define PROC_INTEL      0x00    /* Intel 80x86 */

#define PROC_INTEL      0x00    /* Intel 80x86/ia64 */

#define PROC_MOTOROLA   0x01    /* Motorola 68K */

#define PROC_MIPS4000   0x02    /* MIPS RISC 4000 */

#define PROC_ALPHA      0x03    /* DEC Alpha */
@@ -104,6 +104,7 @@ typedef unsigned int sigINT; 
#define PROC_486        0x08    /* Intel 80486 */

#define PROC_PENTIUM    0x10    /* Intel 586 aka P5 aka Pentium */

#define PROC_SEXIUM	0x20	/* Intel 686 aka P6 aka Pentium Pro or MMX */

#define PROC_IA64	0x40	/* Intel IA64 processor */



/* PROC_i960: */

#define PROC_960RX      0x01    /* Intel 80960RC/RD */

drivers/scsi/hosts.c

+7 −2
Original line number Diff line number Diff line
@@ -456,6 +456,10 @@ static int __scsi_host_match(struct device *dev, void *data) 
 *

 * Return value:

 *	A pointer to located Scsi_Host or NULL.

 *

 *	The caller must do a scsi_host_put() to drop the reference

 *	that scsi_host_get() took. The put_device() below dropped

 *	the reference from class_find_device().

 **/

struct Scsi_Host *scsi_host_lookup(unsigned short hostnum)

{
@@ -463,9 +467,10 @@ struct Scsi_Host *scsi_host_lookup(unsigned short hostnum) 
	struct Scsi_Host *shost = ERR_PTR(-ENXIO);



	cdev = class_find_device(&shost_class, &hostnum, __scsi_host_match);

	if (cdev)

	if (cdev) {

		shost = scsi_host_get(class_to_shost(cdev));



		put_device(cdev);

	}

	return shost;

}

EXPORT_SYMBOL(scsi_host_lookup);

drivers/scsi/sr.c

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ int sr_test_unit_ready(struct scsi_device *sdev, struct scsi_sense_hdr *sshdr) 
		the_result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL,

					      0, sshdr, SR_TIMEOUT,

					      retries--);

		if (scsi_sense_valid(sshdr) &&

		    sshdr->sense_key == UNIT_ATTENTION)

			sdev->changed = 1;



	} while (retries > 0 &&

		 (!scsi_status_is_good(the_result) ||