Commit 0b9e7b74 authored Jun 26, 2014 by Arnd Bergmann Committed by Christoph Hellwig Jul 25, 2014

hpsa: fix non-x86 builds



commit 28e13446 "[SCSI] hpsa: enable unit attention reporting"
turns on unit attention notifications, but got the change wrong for
all architectures other than x86, which now store an uninitialized
value into the device register.

Gcc helpfully warns about this:

../drivers/scsi/hpsa.c: In function 'hpsa_set_driver_support_bits':
../drivers/scsi/hpsa.c:6373:17: warning: 'driver_support' is used uninitialized in this function [-Wuninitialized]
  driver_support |= ENABLE_UNIT_ATTN;
                 ^

This moves the #ifdef so only the prefetch-enable is conditional
on x86, not also reading the initial register contents.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 28e13446 "[SCSI] hpsa: enable unit attention reporting"
Cc: stable@vger.kernel.org # v3.14+
Acked-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent 6aa4c361

drivers/scsi/hpsa.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -6366,9 +6366,9 @@ static inline void hpsa_set_driver_support_bits(struct ctlr_info *h)
		{
		u32 driver_support;

		#ifdef CONFIG_X86
		/* Need to enable prefetch in the SCSI core for 6400 in x86 */
		driver_support = readl(&(h->cfgtable->driver_support));
		/* Need to enable prefetch in the SCSI core for 6400 in x86 */
		#ifdef CONFIG_X86
		driver_support \|= ENABLE_SCSI_PREFETCH;
		#endif
		driver_support \|= ENABLE_UNIT_ATTN;

Admin message