diff --git a/[refs] b/[refs] index dcd4a9d63157..14cfb6d53842 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9e20a920092eb3840424f85c78852c0433df00d +refs/heads/master: 3b71797eff4352b4295919efc52de84f84d33d94 diff --git a/trunk/drivers/block/paride/pd.c b/trunk/drivers/block/paride/pd.c index 62d2464c12f2..2403721f9db1 100644 --- a/trunk/drivers/block/paride/pd.c +++ b/trunk/drivers/block/paride/pd.c @@ -151,6 +151,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV}; #include /* for the eject ioctl */ #include #include +#include #include #include #include @@ -275,7 +276,7 @@ static void pd_print_error(struct pd_unit *disk, char *msg, int status) int i; printk("%s: %s: status = 0x%x =", disk->name, msg, status); - for (i = 0; i < 18; i++) + for (i = 0; i < ARRAY_SIZE(pd_errs); i++) if (status & (1 << i)) printk(" %s", pd_errs[i]); printk("\n");