From: Heiko Carstens <heiko.carstens@de.ibm.com>
To: Andrew Morton <akpm@osdl.org>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>, linux-kernel@vger.kernel.org
Subject: [patch 2/3] s390: fix assignment instead of check in ccw_device_set_online()
Date: Thu, 16 Feb 2006 17:41:33 +0100 [thread overview]
Message-ID: <20060216164133.GI9241@osiris.boeblingen.de.ibm.com> (raw)
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Fix assignment instead of check in ccw_device_set_online().
Also remove unneeded assignment in ccw_device_do_sense().
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
drivers/s390/cio/device.c | 2 +-
drivers/s390/cio/device_status.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff -urpN linux-2.6/drivers/s390/cio/device.c linux-2.6-patched/drivers/s390/cio/device.c
--- linux-2.6/drivers/s390/cio/device.c 2006-02-16 17:10:40.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/device.c 2006-02-16 17:11:00.000000000 +0100
@@ -359,7 +359,7 @@ ccw_device_set_online(struct ccw_device
else
pr_debug("ccw_device_offline returned %d, device %s\n",
ret, cdev->dev.bus_id);
- return (ret = 0) ? -ENODEV : ret;
+ return (ret == 0) ? -ENODEV : ret;
}
static ssize_t
diff -urpN linux-2.6/drivers/s390/cio/device_status.c linux-2.6-patched/drivers/s390/cio/device_status.c
--- linux-2.6/drivers/s390/cio/device_status.c 2006-02-16 17:10:40.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/device_status.c 2006-02-16 17:11:00.000000000 +0100
@@ -317,7 +317,6 @@ ccw_device_do_sense(struct ccw_device *c
/*
* We have ending status but no sense information. Do a basic sense.
*/
- sch = to_subchannel(cdev->dev.parent);
sch->sense_ccw.cmd_code = CCW_CMD_BASIC_SENSE;
sch->sense_ccw.cda = (__u32) __pa(cdev->private->irb.ecw);
sch->sense_ccw.count = SENSE_MAX_COUNT;
reply other threads:[~2006-02-16 16:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060216164133.GI9241@osiris.boeblingen.de.ibm.com \
--to=heiko.carstens@de.ibm.com \
--cc=akpm@osdl.org \
--cc=cornelia.huck@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®