Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fb8b50078458ba74c3d3f7bf05f5ddc27b88f051 Commit: fb8b50078458ba74c3d3f7bf05f5ddc27b88f051 Parent: 6f67f9d26fe5ced50f716e9620b42c0721d8b8d9 Author: Stephen Rothwell <[EMAIL PROTECTED]> AuthorDate: Fri Dec 15 15:40:08 2006 +1100 Committer: Paul Mackerras <[EMAIL PROTECTED]> CommitDate: Wed Dec 20 16:37:47 2006 +1100
[POWERPC] iSeries: fix viodasd init Don't initialise viodasd except on legacy iSeries. Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]> Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]> --- drivers/block/viodasd.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index e19ba4e..68592c3 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c @@ -49,6 +49,7 @@ #include <asm/iseries/hv_lp_event.h> #include <asm/iseries/hv_lp_config.h> #include <asm/iseries/vio.h> +#include <asm/firmware.h> MODULE_DESCRIPTION("iSeries Virtual DASD"); MODULE_AUTHOR("Dave Boutcher"); @@ -769,6 +770,11 @@ static int __init viodasd_init(void) { int rc; + if (!firmware_has_feature(FW_FEATURE_ISERIES)) { + rc = -ENODEV; + goto early_fail; + } + /* Try to open to our host lp */ if (viopath_hostLp == HvLpIndexInvalid) vio_set_hostlp(); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html