| Message ID | 1393321708-9719-1-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 25 February 2014 10:48, Sachin Kamat <sachin.kamat@linaro.org> wrote: > sizeof should be of the parent structure type. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> For the hole series: Acked-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > Hi Ulf / Chris, > > This series which is a re-send has been pending since a very long time. > Hope to have this merged atleast during this cycle. > --- > drivers/mmc/host/ushc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/ushc.c b/drivers/mmc/host/ushc.c > index c0105a2e269a..d2c386f09d69 100644 > --- a/drivers/mmc/host/ushc.c > +++ b/drivers/mmc/host/ushc.c > @@ -504,7 +504,7 @@ static int ushc_probe(struct usb_interface *intf, const struct usb_device_id *id > ret = -ENOMEM; > goto err; > } > - ushc->csw = kzalloc(sizeof(struct ushc_cbw), GFP_KERNEL); > + ushc->csw = kzalloc(sizeof(struct ushc_csw), GFP_KERNEL); > if (ushc->csw == NULL) { > ret = -ENOMEM; > goto err; > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Tue, Feb 25 2014, Sachin Kamat wrote: > Hi Ulf / Chris, > > This series which is a re-send has been pending since a very long time. > Hope to have this merged atleast during this cycle. Thanks, all pushed to mmc-next for 3.15, sorry for the delay. - Chris.
diff --git a/drivers/mmc/host/ushc.c b/drivers/mmc/host/ushc.c index c0105a2e269a..d2c386f09d69 100644 --- a/drivers/mmc/host/ushc.c +++ b/drivers/mmc/host/ushc.c @@ -504,7 +504,7 @@ static int ushc_probe(struct usb_interface *intf, const struct usb_device_id *id ret = -ENOMEM; goto err; } - ushc->csw = kzalloc(sizeof(struct ushc_cbw), GFP_KERNEL); + ushc->csw = kzalloc(sizeof(struct ushc_csw), GFP_KERNEL); if (ushc->csw == NULL) { ret = -ENOMEM; goto err;
sizeof should be of the parent structure type. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- Hi Ulf / Chris, This series which is a re-send has been pending since a very long time. Hope to have this merged atleast during this cycle. --- drivers/mmc/host/ushc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)