Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4950d5d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: mon_main.c: move assignment out of if () block 



We should not be doing assignments within an if () block
so fix up the code to not do this.

change was created using Coccinelle.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
parent 0296951a

drivers/usb/mon/mon_main.c

+8 −4
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ static void mon_submit(struct usb_bus *ubus, struct urb *urb) 
{

	struct mon_bus *mbus;



	if ((mbus = ubus->mon_bus) != NULL)

	mbus = ubus->mon_bus;

	if (mbus != NULL)

		mon_bus_submit(mbus, urb);

	mon_bus_submit(&mon_bus0, urb);

}
@@ -122,7 +123,8 @@ static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error) 
{

	struct mon_bus *mbus;



	if ((mbus = ubus->mon_bus) != NULL)

	mbus = ubus->mon_bus;

	if (mbus != NULL)

		mon_bus_submit_error(mbus, urb, error);

	mon_bus_submit_error(&mon_bus0, urb, error);

}
@@ -148,7 +150,8 @@ static void mon_complete(struct usb_bus *ubus, struct urb *urb, int status) 
{

	struct mon_bus *mbus;



	if ((mbus = ubus->mon_bus) != NULL)

	mbus = ubus->mon_bus;

	if (mbus != NULL)

		mon_bus_complete(mbus, urb, status);

	mon_bus_complete(&mon_bus0, urb, status);

}
@@ -280,7 +283,8 @@ static void mon_bus_init(struct usb_bus *ubus) 
{

	struct mon_bus *mbus;



	if ((mbus = kzalloc(sizeof(struct mon_bus), GFP_KERNEL)) == NULL)

	mbus = kzalloc(sizeof(struct mon_bus), GFP_KERNEL);

	if (mbus == NULL)

		goto err_alloc;

	kref_init(&mbus->ref);

	spin_lock_init(&mbus->lock);