Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / s390 / char / sclp_chp.c

diff --git a/drivers/s390/char/sclp_chp.c b/drivers/s390/char/sclp_chp.c
index a66b914519b5c7dfeb74d780ff60148c870786e5..c68f5e7e63a08a694a61fa54507bad3be20811e6 100644 (file)
--- a/drivers/s390/char/sclp_chp.c
+++ b/drivers/s390/char/sclp_chp.c
@@ -55,6 +55,8 @@ static int do_configure(sclp_cmdw_t cmd)
        struct chp_cfg_data *data;
        int rc;
 
+       if (!SCLP_HAS_CHP_RECONFIG)
+               return -EOPNOTSUPP;
        /* Prepare sccb. */
        data = (struct chp_cfg_data *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
        if (!data)
@@ -152,6 +154,8 @@ int sclp_chp_read_info(struct sclp_chp_info *info)
        struct chp_info_data *data;
        int rc;
 
+       if (!SCLP_HAS_CHP_INFO)
+               return -EOPNOTSUPP;
        /* Prepare sccb. */
        data = (struct chp_info_data *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
        if (!data)