Commit 81b59d75 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: ses: Fixup error message 'failed to get diagnostic page 0xffffffea' 



The printk was using the result as argument, leading to a slightly
confusing log message.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent acf8ab9a

drivers/scsi/ses.c

+10 −7
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static int ses_intf_add(struct device *cdev, 
{

	struct scsi_device *sdev = to_scsi_device(cdev->parent);

	struct scsi_device *tmp_sdev;

	unsigned char *buf = NULL, *hdr_buf, *type_ptr;

	unsigned char *buf = NULL, *hdr_buf, *type_ptr, page;

	struct ses_device *ses_dev;

	u32 result;

	int i, types, len, components = 0;
@@ -631,7 +631,8 @@ static int ses_intf_add(struct device *cdev, 
	if (!hdr_buf || !ses_dev)

		goto err_init_free;



	result = ses_recv_diag(sdev, 1, hdr_buf, INIT_ALLOC_SIZE);

	page = 1;

	result = ses_recv_diag(sdev, page, hdr_buf, INIT_ALLOC_SIZE);

	if (result)

		goto recv_failed;
@@ -640,7 +641,7 @@ static int ses_intf_add(struct device *cdev, 
	if (!buf)

		goto err_free;



	result = ses_recv_diag(sdev, 1, buf, len);

	result = ses_recv_diag(sdev, page, buf, len);

	if (result)

		goto recv_failed;
@@ -670,7 +671,8 @@ static int ses_intf_add(struct device *cdev, 
	ses_dev->page1_len = len;

	buf = NULL;



	result = ses_recv_diag(sdev, 2, hdr_buf, INIT_ALLOC_SIZE);

	page = 2;

	result = ses_recv_diag(sdev, page, hdr_buf, INIT_ALLOC_SIZE);

	if (result)

		goto recv_failed;
@@ -689,7 +691,8 @@ static int ses_intf_add(struct device *cdev, 


	/* The additional information page --- allows us

	 * to match up the devices */

	result = ses_recv_diag(sdev, 10, hdr_buf, INIT_ALLOC_SIZE);

	page = 10;

	result = ses_recv_diag(sdev, page, hdr_buf, INIT_ALLOC_SIZE);

	if (!result) {



		len = (hdr_buf[2] << 8) + hdr_buf[3] + 4;
@@ -697,7 +700,7 @@ static int ses_intf_add(struct device *cdev, 
		if (!buf)

			goto err_free;



		result = ses_recv_diag(sdev, 10, buf, len);

		result = ses_recv_diag(sdev, page, buf, len);

		if (result)

			goto recv_failed;

		ses_dev->page10 = buf;
@@ -735,7 +738,7 @@ static int ses_intf_add(struct device *cdev, 


 recv_failed:

	sdev_printk(KERN_ERR, sdev, "Failed to get diagnostic page 0x%x\n",

		    result);

		    page);

	err = -ENODEV;

 err_free:

	kfree(buf);